diff --git a/Mage.Sets/src/mage/sets/commander2013/NightSoil.java b/Mage.Sets/src/mage/sets/commander2013/NightSoil.java
index b7e0c19736..b83edbc864 100644
--- a/Mage.Sets/src/mage/sets/commander2013/NightSoil.java
+++ b/Mage.Sets/src/mage/sets/commander2013/NightSoil.java
@@ -33,7 +33,7 @@ import java.util.UUID;
  *
  * @author LevelX2
  */
-public class NightSoil extends mage.sets.fallenempires.NightSoil {
+public class NightSoil extends mage.sets.fallenempires.NightSoil1 {
 
     public NightSoil(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/elspethvskiora/IcatianJavelineers.java
index 259b571d0d..bbde1977f5 100644
--- a/Mage.Sets/src/mage/sets/elspethvskiora/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/elspethvskiora/IcatianJavelineers.java
@@ -33,7 +33,7 @@ import java.util.UUID;
  *
  * @author fireshoes
  */
-public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelineers {
+public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelineers1 {
 
     public IcatianJavelineers(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade1.java
similarity index 86%
rename from Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade.java
rename to Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade1.java
index 0396099817..9a8e8e4cf6 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade1.java
@@ -34,21 +34,21 @@ import mage.constants.Rarity;
  *
  * @author North
  */
-public class GoblinGrenade extends mage.sets.magic2012.GoblinGrenade {
+public class GoblinGrenade1 extends mage.sets.magic2012.GoblinGrenade {
 
-    public GoblinGrenade(UUID ownerId) {
+    public GoblinGrenade1(UUID ownerId) {
         super(ownerId);
         this.cardNumber = 114;
         this.expansionSetCode = "FEM";
         this.rarity = Rarity.COMMON;
     }
 
-    public GoblinGrenade(final GoblinGrenade card) {
+    public GoblinGrenade1(final GoblinGrenade1 card) {
         super(card);
     }
 
     @Override
-    public GoblinGrenade copy() {
-        return new GoblinGrenade(this);
+    public GoblinGrenade1 copy() {
+        return new GoblinGrenade1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade2.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade2.java
new file mode 100644
index 0000000000..a62d5202ee
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade2.java
@@ -0,0 +1,54 @@
+/*
+ *  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.fallenempires;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author North
+ */
+public class GoblinGrenade2 extends mage.sets.magic2012.GoblinGrenade {
+
+    public GoblinGrenade2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 115;
+        this.expansionSetCode = "FEM";
+        this.rarity = Rarity.COMMON;
+    }
+
+    public GoblinGrenade2(final GoblinGrenade2 card) {
+        super(card);
+    }
+
+    @Override
+    public GoblinGrenade2 copy() {
+        return new GoblinGrenade2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade3.java b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade3.java
new file mode 100644
index 0000000000..752f2d3062
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/GoblinGrenade3.java
@@ -0,0 +1,54 @@
+/*
+ *  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.fallenempires;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author North
+ */
+public class GoblinGrenade3 extends mage.sets.magic2012.GoblinGrenade {
+
+    public GoblinGrenade3(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 116;
+        this.expansionSetCode = "FEM";
+        this.rarity = Rarity.COMMON;
+    }
+
+    public GoblinGrenade3(final GoblinGrenade3 card) {
+        super(card);
+    }
+
+    @Override
+    public GoblinGrenade3 copy() {
+        return new GoblinGrenade3(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach1.java
similarity index 91%
rename from Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java
rename to Mage.Sets/src/mage/sets/fallenempires/HymnToTourach1.java
index 314a045ff7..ae9ec58249 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach1.java
@@ -38,9 +38,9 @@ import mage.target.TargetPlayer;
  *
  * @author jonubuu
  */
-public class HymnToTourach extends CardImpl {
+public class HymnToTourach1 extends CardImpl {
 
-    public HymnToTourach(UUID ownerId) {
+    public HymnToTourach1(UUID ownerId) {
         super(ownerId, 12, "Hymn to Tourach", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}{B}");
         this.expansionSetCode = "FEM";
 
@@ -50,12 +50,12 @@ public class HymnToTourach extends CardImpl {
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
 
-    public HymnToTourach(final HymnToTourach card) {
+    public HymnToTourach1(final HymnToTourach1 card) {
         super(card);
     }
 
     @Override
-    public HymnToTourach copy() {
-        return new HymnToTourach(this);
+    public HymnToTourach1 copy() {
+        return new HymnToTourach1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach2.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach2.java
new file mode 100644
index 0000000000..e500765ff1
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach2.java
@@ -0,0 +1,56 @@
+/*
+ *  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.fallenempires;
+
+import java.util.UUID;
+import mage.abilities.effects.common.discard.DiscardTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author jonubuu
+ */
+public class HymnToTourach2 extends mage.sets.fallenempires.HymnToTourach1 {
+
+    public HymnToTourach2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 13;
+   }
+
+    public HymnToTourach2(final HymnToTourach2 card) {
+        super(card);
+    }
+
+    @Override
+    public HymnToTourach2 copy() {
+        return new HymnToTourach2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach3.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach3.java
new file mode 100644
index 0000000000..b48d4ff551
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach3.java
@@ -0,0 +1,56 @@
+/*
+ *  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.fallenempires;
+
+import java.util.UUID;
+import mage.abilities.effects.common.discard.DiscardTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author jonubuu
+ */
+public class HymnToTourach3 extends mage.sets.fallenempires.HymnToTourach1 {
+
+    public HymnToTourach3(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 14;
+   }
+
+    public HymnToTourach3(final HymnToTourach3 card) {
+        super(card);
+    }
+
+    @Override
+    public HymnToTourach3 copy() {
+        return new HymnToTourach3(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach4.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach4.java
new file mode 100644
index 0000000000..591b97f878
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach4.java
@@ -0,0 +1,56 @@
+/*
+ *  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.fallenempires;
+
+import java.util.UUID;
+import mage.abilities.effects.common.discard.DiscardTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author jonubuu
+ */
+public class HymnToTourach4 extends mage.sets.fallenempires.HymnToTourach1 {
+
+    public HymnToTourach4(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 15;
+   }
+
+    public HymnToTourach4(final HymnToTourach4 card) {
+        super(card);
+    }
+
+    @Override
+    public HymnToTourach4 copy() {
+        return new HymnToTourach4(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers1.java
similarity index 93%
rename from Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers.java
rename to Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers1.java
index e525ddff68..a3a36e4168 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers1.java
@@ -47,9 +47,9 @@ import mage.target.common.TargetCreatureOrPlayer;
  *
  * @author fireshoes
  */
-public class IcatianJavelineers extends CardImpl {
+public class IcatianJavelineers1 extends CardImpl {
 
-    public IcatianJavelineers(UUID ownerId) {
+    public IcatianJavelineers1(UUID ownerId) {
         super(ownerId, 148, "Icatian Javelineers", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}");
         this.expansionSetCode = "FEM";
         this.subtype.add("Human");
@@ -67,12 +67,12 @@ public class IcatianJavelineers extends CardImpl {
         this.addAbility(ability);
     }
 
-    public IcatianJavelineers(final IcatianJavelineers card) {
+    public IcatianJavelineers1(final IcatianJavelineers1 card) {
         super(card);
     }
 
     @Override
-    public IcatianJavelineers copy() {
-        return new IcatianJavelineers(this);
+    public IcatianJavelineers1 copy() {
+        return new IcatianJavelineers1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers2.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers2.java
new file mode 100644
index 0000000000..793fe6afae
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers2.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.timeshifted;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class IcatianJavelineers2 extends mage.sets.fallenempires.IcatianJavelineers1 {
+
+    public IcatianJavelineers2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 149;
+    }
+
+    public IcatianJavelineers2(final IcatianJavelineers2 card) {
+        super(card);
+    }
+
+    @Override
+    public IcatianJavelineers2 copy() {
+        return new IcatianJavelineers2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java
new file mode 100644
index 0000000000..8564935729
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.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.timeshifted;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class IcatianJavelineers3 extends mage.sets.fallenempires.IcatianJavelineers1 {
+
+    public IcatianJavelineers3(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 150;
+    }
+
+    public IcatianJavelineers3(final IcatianJavelineers3 card) {
+        super(card);
+    }
+
+    @Override
+    public IcatianJavelineers3 copy() {
+        return new IcatianJavelineers3(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/NightSoil.java b/Mage.Sets/src/mage/sets/fallenempires/NightSoil1.java
similarity index 91%
rename from Mage.Sets/src/mage/sets/fallenempires/NightSoil.java
rename to Mage.Sets/src/mage/sets/fallenempires/NightSoil1.java
index aa9118664a..f31f9bfcb0 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/NightSoil.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/NightSoil1.java
@@ -45,9 +45,9 @@ import mage.target.common.TargetCardInASingleGraveyard;
  *
  * @author LevelX2
  */
-public class NightSoil extends CardImpl {
+public class NightSoil1 extends CardImpl {
 
-    public NightSoil(UUID ownerId) {
+    public NightSoil1(UUID ownerId) {
         super(ownerId, 80, "Night Soil", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}{G}");
         this.expansionSetCode = "FEM";
 
@@ -58,12 +58,12 @@ public class NightSoil extends CardImpl {
         this.addAbility(ability);
     }
 
-    public NightSoil(final NightSoil card) {
+    public NightSoil1(final NightSoil1 card) {
         super(card);
     }
 
     @Override
-    public NightSoil copy() {
-        return new NightSoil(this);
+    public NightSoil1 copy() {
+        return new NightSoil1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java b/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java
new file mode 100644
index 0000000000..09706ba97b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.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.masterseditionii;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class NightSoil2 extends mage.sets.fallenempires.NightSoil1 {
+
+    public NightSoil2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 81;
+    }
+
+    public NightSoil2(final NightSoil2 card) {
+        super(card);
+    }
+
+    @Override
+    public NightSoil2 copy() {
+        return new NightSoil2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java b/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java
new file mode 100644
index 0000000000..7289331f5f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.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.masterseditionii;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class NightSoil3 extends mage.sets.fallenempires.NightSoil1 {
+
+    public NightSoil3(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 82;
+    }
+
+    public NightSoil3(final NightSoil3 card) {
+        super(card);
+    }
+
+    @Override
+    public NightSoil3 copy() {
+        return new NightSoil3(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/mastersedition/HymnToTourach.java b/Mage.Sets/src/mage/sets/mastersedition/HymnToTourach.java
index 1d8d6d5d37..21e4af02e9 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/HymnToTourach.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/HymnToTourach.java
@@ -34,7 +34,7 @@ import mage.constants.Rarity;
  *
  * @author LevelX2
  */
-public class HymnToTourach extends mage.sets.fallenempires.HymnToTourach {
+public class HymnToTourach extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/masterseditionii/IcatianJavelineers.java
index cd8d2c6023..5df5c74144 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/IcatianJavelineers.java
@@ -33,7 +33,7 @@ import java.util.UUID;
  *
  * @author LevelX2
  */
-public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelineers {
+public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelineers1 {
 
     public IcatianJavelineers(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/NightSoil.java b/Mage.Sets/src/mage/sets/masterseditionii/NightSoil.java
index bfd1a3da30..17998657fb 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/NightSoil.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/NightSoil.java
@@ -34,7 +34,7 @@ import mage.constants.Rarity;
  *
  * @author LevelX2
  */
-public class NightSoil extends mage.sets.fallenempires.NightSoil {
+public class NightSoil extends mage.sets.fallenempires.NightSoil1 {
 
     public NightSoil(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/timeshifted/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/timeshifted/IcatianJavelineers.java
index 39aa3d2541..c286899663 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/IcatianJavelineers.java
@@ -34,7 +34,7 @@ import mage.constants.Rarity;
  *
  * @author fireshoes
  */
-public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelineers {
+public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelineers1 {
 
     public IcatianJavelineers(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/HymnToTourach.java b/Mage.Sets/src/mage/sets/vintagemasters/HymnToTourach.java
index 8d891d3d83..c2aabdb54e 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/HymnToTourach.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/HymnToTourach.java
@@ -34,7 +34,7 @@ import mage.constants.Rarity;
  *
  * @author LevelX2
  */
-public class HymnToTourach extends mage.sets.fallenempires.HymnToTourach {
+public class HymnToTourach extends mage.sets.fallenempires.HymnToTourach1 {
 
     public HymnToTourach(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/wpngateway/IcatianJavelineers.java b/Mage.Sets/src/mage/sets/wpngateway/IcatianJavelineers.java
index dab3bbbc36..c70e020699 100644
--- a/Mage.Sets/src/mage/sets/wpngateway/IcatianJavelineers.java
+++ b/Mage.Sets/src/mage/sets/wpngateway/IcatianJavelineers.java
@@ -34,7 +34,7 @@ import mage.constants.Rarity;
  *
  * @author fireshoes
  */
-public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelineers {
+public class IcatianJavelineers extends mage.sets.fallenempires.IcatianJavelineers1 {
 
     public IcatianJavelineers(UUID ownerId) {
         super(ownerId);