diff --git a/Mage.Sets/src/mage/sets/alliances/AesthirGlider.java b/Mage.Sets/src/mage/sets/alliances/AesthirGlider1.java
similarity index 91%
rename from Mage.Sets/src/mage/sets/alliances/AesthirGlider.java
rename to Mage.Sets/src/mage/sets/alliances/AesthirGlider1.java
index 151644e67f1..09b57214a03 100644
--- a/Mage.Sets/src/mage/sets/alliances/AesthirGlider.java
+++ b/Mage.Sets/src/mage/sets/alliances/AesthirGlider1.java
@@ -39,9 +39,9 @@ import mage.constants.Rarity;
  *
  * @author Sir-Speshkitty
  */
-public class AesthirGlider extends CardImpl {
+public class AesthirGlider1 extends CardImpl {
 
-    public AesthirGlider(UUID ownerId) {
+    public AesthirGlider1(UUID ownerId) {
         super(ownerId, 156, "Aesthir Glider", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}");
         this.expansionSetCode = "ALL";
         this.subtype.add("Bird");
@@ -54,12 +54,12 @@ public class AesthirGlider extends CardImpl {
         this.addAbility(new CantBlockAbility());
     }
 
-    public AesthirGlider(final AesthirGlider card) {
+    public AesthirGlider1(final AesthirGlider1 card) {
         super(card);
     }
 
     @Override
-    public AesthirGlider copy() {
-        return new AesthirGlider(this);
+    public AesthirGlider1 copy() {
+        return new AesthirGlider1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/alliances/AesthirGlider2.java b/Mage.Sets/src/mage/sets/alliances/AesthirGlider2.java
new file mode 100644
index 00000000000..4436d4a4302
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/AesthirGlider2.java
@@ -0,0 +1,52 @@
+/*
+ *  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.alliances;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class AesthirGlider2 extends mage.sets.alliances.AesthirGlider1 {
+
+    public AesthirGlider2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 157;
+        this.expansionSetCode = "ALL";
+    }
+
+    public AesthirGlider2(final AesthirGlider2 card) {
+        super(card);
+    }
+
+    @Override
+    public AesthirGlider2 copy() {
+        return new AesthirGlider2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/SoldeviSage.java b/Mage.Sets/src/mage/sets/alliances/SoldeviSage1.java
similarity index 95%
rename from Mage.Sets/src/mage/sets/alliances/SoldeviSage.java
rename to Mage.Sets/src/mage/sets/alliances/SoldeviSage1.java
index 03cd710c079..23be1a5fc33 100644
--- a/Mage.Sets/src/mage/sets/alliances/SoldeviSage.java
+++ b/Mage.Sets/src/mage/sets/alliances/SoldeviSage1.java
@@ -53,9 +53,9 @@ import mage.target.common.TargetControlledPermanent;
  *
  * @author Quercitron
  */
-public class SoldeviSage extends CardImpl {
+public class SoldeviSage1 extends CardImpl {
 
-    public SoldeviSage(UUID ownerId) {
+    public SoldeviSage1(UUID ownerId) {
         super(ownerId, 51, "Soldevi Sage", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}");
         this.expansionSetCode = "ALL";
         this.subtype.add("Human");
@@ -70,13 +70,13 @@ public class SoldeviSage extends CardImpl {
         this.addAbility(ability);
     }
 
-    public SoldeviSage(final SoldeviSage card) {
+    public SoldeviSage1(final SoldeviSage1 card) {
         super(card);
     }
 
     @Override
-    public SoldeviSage copy() {
-        return new SoldeviSage(this);
+    public SoldeviSage1 copy() {
+        return new SoldeviSage1(this);
     }
 }
 
@@ -86,7 +86,7 @@ class SoldeviSageEffect extends OneShotEffect {
         super(Outcome.DrawCard);
         this.staticText = "Draw three cards, then discard one of them";
     }
-    
+
     public SoldeviSageEffect(final SoldeviSageEffect effect) {
         super(effect);
     }
@@ -95,7 +95,7 @@ class SoldeviSageEffect extends OneShotEffect {
     public SoldeviSageEffect copy() {
         return new SoldeviSageEffect(this);
     }
-    
+
     @Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
@@ -108,7 +108,7 @@ class SoldeviSageEffect extends OneShotEffect {
                     drawnCards.add(cardId);
                 }
             }
-            
+
             if (drawnCards.size() > 0) {
                 TargetCard cardToDiscard = new TargetCard(Zone.PICK, new FilterCard("card to discard"));
                 cardToDiscard.setNotTarget(true);
@@ -119,10 +119,10 @@ class SoldeviSageEffect extends OneShotEffect {
                     }
                 }
             }
-            
+
             return true;
         }
         return false;
     }
-    
+
 }
diff --git a/Mage.Sets/src/mage/sets/alliances/SoldeviSage2.java b/Mage.Sets/src/mage/sets/alliances/SoldeviSage2.java
new file mode 100644
index 00000000000..4705fe539b0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/SoldeviSage2.java
@@ -0,0 +1,52 @@
+/*
+ *  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.alliances;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class SoldeviSage2 extends mage.sets.alliances.SoldeviSage1 {
+
+    public SoldeviSage2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 52;
+        this.expansionSetCode = "ALL";
+    }
+
+    public SoldeviSage2(final SoldeviSage2 card) {
+        super(card);
+    }
+
+    @Override
+    public SoldeviSage2 copy() {
+        return new SoldeviSage2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java b/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java
index 67da756257b..09ccbe39bf9 100644
--- a/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java
+++ b/Mage.Sets/src/mage/sets/classicsixthedition/SoldeviSage.java
@@ -34,7 +34,7 @@ import mage.constants.Rarity;
  *
  * @author Quercitron
  */
-public class SoldeviSage extends mage.sets.alliances.SoldeviSage {
+public class SoldeviSage extends mage.sets.alliances.SoldeviSage1 {
 
     public SoldeviSage(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Torture.java b/Mage.Sets/src/mage/sets/fifthedition/Torture.java
index d17b911323b..1ad9ad91013 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Torture.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Torture.java
@@ -34,7 +34,7 @@ import java.util.UUID;
  * @author jeffwadsworth
 
  */
-public class Torture extends mage.sets.homelands.Torture {
+public class Torture extends mage.sets.homelands.Torture1 {
 
     public Torture(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/homelands/AbbeyMatron.java b/Mage.Sets/src/mage/sets/homelands/AbbeyMatron1.java
similarity index 90%
rename from Mage.Sets/src/mage/sets/homelands/AbbeyMatron.java
rename to Mage.Sets/src/mage/sets/homelands/AbbeyMatron1.java
index 6145b1d0c58..66a5bc77c73 100644
--- a/Mage.Sets/src/mage/sets/homelands/AbbeyMatron.java
+++ b/Mage.Sets/src/mage/sets/homelands/AbbeyMatron1.java
@@ -44,10 +44,10 @@ import mage.constants.Zone;
  *
  * @author Sir-Speshkitty
  */
-public class AbbeyMatron extends CardImpl {
+public class AbbeyMatron1 extends CardImpl {
 
-    public AbbeyMatron(UUID ownerId) {
-        super(ownerId, 103, "Abbey Matron", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+    public AbbeyMatron1(UUID ownerId) {
+        super(ownerId, 102, "Abbey Matron", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
         this.expansionSetCode = "HML";
         this.subtype.add("Human");
         this.subtype.add("Cleric");
@@ -60,12 +60,12 @@ public class AbbeyMatron extends CardImpl {
         this.addAbility(ability);
     }
 
-    public AbbeyMatron(final AbbeyMatron card) {
+    public AbbeyMatron1(final AbbeyMatron1 card) {
         super(card);
     }
 
     @Override
-    public AbbeyMatron copy() {
-        return new AbbeyMatron(this);
+    public AbbeyMatron1 copy() {
+        return new AbbeyMatron1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/homelands/AbbeyMatron2.java b/Mage.Sets/src/mage/sets/homelands/AbbeyMatron2.java
new file mode 100644
index 00000000000..63a97db67a4
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/homelands/AbbeyMatron2.java
@@ -0,0 +1,52 @@
+/*
+ *  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.homelands;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class AbbeyMatron2 extends mage.sets.homelands.AbbeyMatron1 {
+
+    public AbbeyMatron2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 103;
+        this.expansionSetCode = "HML";
+    }
+
+    public AbbeyMatron2(final AbbeyMatron2 card) {
+        super(card);
+    }
+
+    @Override
+    public AbbeyMatron2 copy() {
+        return new AbbeyMatron2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/homelands/CemeteryGate.java b/Mage.Sets/src/mage/sets/homelands/CemeteryGate1.java
similarity index 90%
rename from Mage.Sets/src/mage/sets/homelands/CemeteryGate.java
rename to Mage.Sets/src/mage/sets/homelands/CemeteryGate1.java
index b88935ab7cd..6737e587211 100644
--- a/Mage.Sets/src/mage/sets/homelands/CemeteryGate.java
+++ b/Mage.Sets/src/mage/sets/homelands/CemeteryGate1.java
@@ -42,16 +42,16 @@ import mage.filter.predicate.mageobject.ColorPredicate;
  *
  * @author fireshoes
  */
-public class CemeteryGate extends CardImpl {
-    
+public class CemeteryGate1 extends CardImpl {
+
     private static final FilterCard filter = new FilterCard("Black");
-    
+
     static {
         filter.add(new ColorPredicate(ObjectColor.BLACK));
     }
 
-    public CemeteryGate(UUID ownerId) {
-        super(ownerId, 5, "Cemetery Gate", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}");
+    public CemeteryGate1(UUID ownerId) {
+        super(ownerId, 4, "Cemetery Gate", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}");
         this.expansionSetCode = "HML";
         this.subtype.add("Wall");
         this.power = new MageInt(0);
@@ -59,17 +59,17 @@ public class CemeteryGate extends CardImpl {
 
         // Defender
         this.addAbility(DefenderAbility.getInstance());
-        
+
         // Protection from black
         this.addAbility(new ProtectionAbility(filter));
     }
 
-    public CemeteryGate(final CemeteryGate card) {
+    public CemeteryGate1(final CemeteryGate1 card) {
         super(card);
     }
 
     @Override
-    public CemeteryGate copy() {
-        return new CemeteryGate(this);
+    public CemeteryGate1 copy() {
+        return new CemeteryGate1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/homelands/CemeteryGate2.java b/Mage.Sets/src/mage/sets/homelands/CemeteryGate2.java
new file mode 100644
index 00000000000..f1e2b3776a7
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/homelands/CemeteryGate2.java
@@ -0,0 +1,52 @@
+/*
+ *  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.homelands;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class CemeteryGate2 extends mage.sets.homelands.CemeteryGate1 {
+
+    public CemeteryGate2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 5;
+        this.expansionSetCode = "HML";
+    }
+
+    public CemeteryGate2(final CemeteryGate2 card) {
+        super(card);
+    }
+
+    @Override
+    public CemeteryGate2 copy() {
+        return new CemeteryGate2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/homelands/Torture.java b/Mage.Sets/src/mage/sets/homelands/Torture1.java
similarity index 92%
rename from Mage.Sets/src/mage/sets/homelands/Torture.java
rename to Mage.Sets/src/mage/sets/homelands/Torture1.java
index fce655bf927..7806cd0b506 100644
--- a/Mage.Sets/src/mage/sets/homelands/Torture.java
+++ b/Mage.Sets/src/mage/sets/homelands/Torture1.java
@@ -48,11 +48,11 @@ import mage.target.common.TargetCreaturePermanent;
  * @author jeffwadsworth
 
  */
-public class Torture extends CardImpl {
-    
+public class Torture1 extends CardImpl {
+
     private static final String rule = "Testing rules";
 
-    public Torture(UUID ownerId) {
+    public Torture1(UUID ownerId) {
         super(ownerId, 23, "Torture", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}");
         this.expansionSetCode = "HML";
         this.subtype.add("Aura");
@@ -64,7 +64,7 @@ public class Torture extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
-        
+
         // {1}{B}: Put a -1/-1 counter on enchanted creature.
         //this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAttachedEffect(CounterType.M1M1.createInstance(), rule), new ManaCostsImpl("[1}{B}")));
         this.addAbility(new SimpleActivatedAbility(
@@ -73,12 +73,12 @@ public class Torture extends CardImpl {
                 new ManaCostsImpl("{1}{B}")));
     }
 
-    public Torture(final Torture card) {
+    public Torture1(final Torture1 card) {
         super(card);
     }
 
     @Override
-    public Torture copy() {
-        return new Torture(this);
+    public Torture1 copy() {
+        return new Torture1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/homelands/Torture2.java b/Mage.Sets/src/mage/sets/homelands/Torture2.java
new file mode 100644
index 00000000000..48520a79eae
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/homelands/Torture2.java
@@ -0,0 +1,52 @@
+/*
+ *  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.homelands;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class Torture2 extends mage.sets.homelands.Torture1 {
+
+    public Torture2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 24;
+        this.expansionSetCode = "HML";
+    }
+
+    public Torture2(final Torture2 card) {
+        super(card);
+    }
+
+    @Override
+    public Torture2 copy() {
+        return new Torture2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AesthirGlider.java b/Mage.Sets/src/mage/sets/masterseditioniv/AesthirGlider.java
index a077d615868..fcf7548396b 100644
--- a/Mage.Sets/src/mage/sets/masterseditioniv/AesthirGlider.java
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AesthirGlider.java
@@ -33,7 +33,7 @@ import java.util.UUID;
  *
  * @author LevelX2
  */
-public class AesthirGlider extends mage.sets.alliances.AesthirGlider {
+public class AesthirGlider extends mage.sets.alliances.AesthirGlider1 {
 
     public AesthirGlider(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Torture.java b/Mage.Sets/src/mage/sets/shadowmoor/Torture.java
index d2e7c5a67ac..ac9b7ee8ff3 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/Torture.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/Torture.java
@@ -34,7 +34,7 @@ import java.util.UUID;
  * @author jeffwadsworth
 
  */
-public class Torture extends mage.sets.homelands.Torture {
+public class Torture extends mage.sets.homelands.Torture1 {
 
     public Torture(UUID ownerId) {
         super(ownerId);