diff --git a/Mage.Sets/src/mage/sets/dissension/BloodCrypt.java b/Mage.Sets/src/mage/sets/dissension/BloodCrypt.java
index 7e02098f0c2..9487a6a68f7 100644
--- a/Mage.Sets/src/mage/sets/dissension/BloodCrypt.java
+++ b/Mage.Sets/src/mage/sets/dissension/BloodCrypt.java
@@ -53,7 +53,7 @@ public class BloodCrypt extends CardImpl<BloodCrypt> {
         this.subtype.add("Mountain");
         this.addAbility(new BlackManaAbility());
         this.addAbility(new RedManaAbility());
-        this.addAbility(new EntersBattlefieldAbility(new TapSourceUnlessPaysEffect(new PayLifeCost(2)), "As Blood Crypt enters the battlefield, you may pay 2 life. If you don't, Blood Crypt enters the battlefield tapped"));
+        this.addAbility(new EntersBattlefieldAbility(new TapSourceUnlessPaysEffect(new PayLifeCost(2)), "As {this} enters the battlefield, you may pay 2 life. If you don't, {this} enters the battlefield tapped"));
     }
 
     public BloodCrypt (final BloodCrypt card) {
diff --git a/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java
index 2d0c2afc7b7..f464e3961f7 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java
@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java
index 1571689bd66..f07dfcf3a15 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.keyword.ChangelingAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java b/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java
index ebbfbaaf74b..3d8c2c9aab6 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java
@@ -27,12 +27,13 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java b/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java
index 700d210f155..3ed1a27a76a 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java
@@ -27,15 +27,12 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
-import mage.abilities.effects.common.continious.BoostEnchantedEffect;
 import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
 import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.abilities.keyword.EnchantAbility;
@@ -43,6 +40,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java
index 000cc6f9ac8..ac102946fe5 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -47,6 +45,8 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.MerfolkToken;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java
index ffd89327cb7..6d45ea36bae 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.filter.Filter;
 import mage.filter.FilterPermanent;
 import mage.target.TargetPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java b/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java
index 9ed8d82429a..01d63fa54eb 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
@@ -36,6 +35,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java b/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java
index f576d6d34a7..f6f22de8dbe 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java
@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java b/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java
index f083e376c97..8fd2528bbfa 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java
@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.keyword.ReachAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java
index 73d9ea0afc2..cb45e2f35af 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -47,6 +45,8 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.KithkinToken;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java b/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java
index b4207d3e083..29ee6763987 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
 import mage.abilities.keyword.IslandwalkAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java
index 706c28eb439..8c8e532552d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -41,6 +39,8 @@ import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.FilterCard;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java
index f0f56d0281c..66eccefd45f 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -38,6 +37,8 @@ import mage.counters.CounterType;
 import mage.filter.Filter;
 import mage.filter.FilterCard;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java
index d60445a0f31..0bdbb3cf1b2 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
@@ -37,6 +36,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.ElfToken;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java
index 88bd2c95ab3..16fb3b9e303 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -44,6 +42,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java
index 860e0872657..6ed21415841 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DestroyTargetEffect;
@@ -36,6 +35,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java b/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java
index 1f01160a619..6f8ed9ad791 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,6 +41,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterControlledPermanent;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java b/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java
index 89f53b1e5fe..f2825fcfef4 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.costs.common.ReturnToHandTargetCost;
@@ -36,6 +35,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetSpell;
 import mage.target.common.TargetControlledCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java b/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java
index 65592ac7377..d6d6d58f954 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -37,6 +35,8 @@ import mage.abilities.effects.common.continious.BoostAllEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java
index 1f5e657ea0c..12e3db99e7a 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -38,6 +36,8 @@ import mage.abilities.costs.mana.ColoredManaCost;
 import mage.abilities.effects.common.continious.BoostSourceEffect;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java b/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java
index ba553a1245c..ba85a966544 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java
index 723daf57efe..517f05c379a 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java
@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java
index 2d40d4ba6e7..799b6c66b11 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect;
 import mage.abilities.keyword.ChangelingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java b/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java
index ab24a9b9c6d..941d7952ee0 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
@@ -47,6 +46,8 @@ import mage.game.Game;
 import mage.players.Player;
 import mage.target.TargetCard;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
index 4a9e4707f41..b4113703187 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,7 +41,8 @@ import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.FilterPermanent;
 import mage.target.TargetPermanent;
-import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java b/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java
index 76050f74450..401fd832c22 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -46,6 +44,8 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.KithkinToken;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java b/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java
index 75e59689b38..ee0eb9dd75b 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -44,6 +42,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterControlledPermanent;
 import mage.target.common.TargetAttackingOrBlockingCreature;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java
index 59312e5b60f..6f50c2be8d0 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -47,6 +45,8 @@ import mage.game.permanent.token.Token;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java b/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java
index 67bf76a16fb..31c9775a6e7 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.effects.common.RegenerateTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java
index 17775eb3099..2117c1a4646 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java
@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.keyword.MountainwalkAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java b/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java
index 403d39212f8..3c974470c7c 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -45,6 +43,8 @@ import mage.cards.CardImpl;
 import mage.counters.CounterType;
 import mage.game.permanent.token.Token;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java
index 217dce58558..23087b0dcaf 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java b/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java
index a8895534a88..31fa0f6610d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Mode;
@@ -36,6 +35,8 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java
index dbbe7f044a7..501b464283d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
@@ -44,6 +43,8 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java
index 3299a8aa04c..8ba2b64b571 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -45,6 +43,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.permanent.token.ElfToken;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java b/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java
index 52efdb9cddb..b9c6ea323a7 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java
@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java
index d6304335770..99c65b154be 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java
index f7d2420735d..58551fa139b 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java b/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java
index ffa32e088dc..76dee4f972a 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -41,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetAttackingCreature;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java b/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java
index 7c0911808da..46085cbdf9d 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.effects.common.PreventDamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java b/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java
index aea5321c247..2a4d2d3c3c6 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.keyword.FirstStrikeAbility;
 import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java
index 39c80f746df..b575ddf4780 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java
@@ -27,18 +27,17 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DrawCardControllerEffect;
-import mage.abilities.effects.common.DrawCardEffect;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.DeathtouchAbility;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java b/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java
index e627647dbcb..cdb8ba30627 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java
@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.mana.GreenManaAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java b/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java
index 1ed736b0d54..72d7d1a3b6b 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java
@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java
index e79ceb0ebe9..e86ceb2e83e 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -38,6 +37,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.game.permanent.token.ElfToken;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java b/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java
index fcfeedd42a9..98641bbc3f2 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,9 +41,10 @@ import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.target.Target;
 import mage.target.common.TargetControlledCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java b/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java
index 3a8f67b2d37..f2c2ddb07e0 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java
@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.keyword.DeathtouchAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java
index 226d39d70be..ee2b7c49474 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -37,6 +36,8 @@ import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java b/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java
index 79b5714db15..2c060986c2a 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java
@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetAttackingOrBlockingCreature;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java
index c44b77ff651..13caa1e57af 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -45,6 +43,8 @@ import mage.filter.Filter;
 import mage.filter.FilterPermanent;
 import mage.target.TargetPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java b/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java
index 6d6539f6671..53fb8cec92f 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.common.CantBlockAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java b/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java
index f0e8c5c8742..ea3a2b3befd 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java
@@ -27,14 +27,15 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.keyword.VigilanceAbility;
 import mage.abilities.keyword.TrampleAbility;
+import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java b/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java
index 925d464b13b..046b2a86bd1 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java
@@ -27,14 +27,15 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.FirstStrikeAbility;
+import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java b/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java
index f936a337648..0c9a021b4f8 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,6 +41,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java b/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java
index dcd6461d383..1b56df49835 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
@@ -41,6 +40,8 @@ import mage.cards.CardImpl;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java
index a0778c905db..8fe1ffdcc44 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -41,10 +39,11 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.ShroudAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
-import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java b/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java
index 9a9ff27f926..eda0baee49b 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java
@@ -27,13 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.cards.CardImpl;
@@ -41,6 +38,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInLibrary;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java b/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java
index 6ac938d5db9..6968ee193e1 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.keyword.FlashAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java b/Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java
index 9e2833a07c1..ed86fa5be49 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java
@@ -27,17 +27,17 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ColoredManaCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java
index 7339d0b5e0f..9a549315b34 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.RegenerateSourceEffect;
 import mage.abilities.keyword.ChangelingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java b/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java
index e1d67b14efc..f569aac18cb 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java
index ef314ce7f05..a18f8e7d3f3 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.keyword.FearAbility;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java b/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java
index 90dbe2b9041..e82778a8940 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
@@ -38,6 +36,8 @@ import mage.cards.CardImpl;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  * @author Loki
  */
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java
index d86adf97541..87075b071b2 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.MerfolkToken;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java b/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java
index b67bdfa58c0..563004f023b 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,9 +37,10 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
-import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java b/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java
index dda21e15927..312e1d16bb3 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -44,6 +42,8 @@ import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java b/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java
index e7833e4a8f1..99cb60a6151 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Tarfire.java
@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java
index daf5f48b0f3..0fdee8d06c7 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -41,6 +39,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java b/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java
index e80abd76cbb..ecd747286cb 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author anonymous
diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividCrag.java b/Mage.Sets/src/mage/sets/lorwyn/VividCrag.java
index 3c099d08b23..bff67c94a25 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/VividCrag.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/VividCrag.java
@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
@@ -50,8 +53,9 @@ public class VividCrag extends CardImpl<VividCrag> {
         super(ownerId, 275, "Vivid Crag", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Crag enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {R} to your mana pool.
         this.addAbility(new RedManaAbility());
         // {tap}, Remove a charge counter from Vivid Crag: Add one mana of any color to your mana pool.
diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividCreek.java b/Mage.Sets/src/mage/sets/lorwyn/VividCreek.java
index f3ea3a81a57..fde11a5aa5e 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/VividCreek.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/VividCreek.java
@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.BlueManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
@@ -50,8 +53,9 @@ public class VividCreek extends CardImpl<VividCreek> {
         super(ownerId, 276, "Vivid Creek", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Creek enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {U} to your mana pool.
         this.addAbility(new BlueManaAbility());
         // {tap}, Remove a charge counter from Vivid Creek: Add one mana of any color to your mana pool.
diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividGrove.java b/Mage.Sets/src/mage/sets/lorwyn/VividGrove.java
index 4616b4bd6c5..e4514ec8143 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/VividGrove.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/VividGrove.java
@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.GreenManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
@@ -50,8 +53,9 @@ public class VividGrove extends CardImpl<VividGrove> {
         super(ownerId, 277, "Vivid Grove", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Grove enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {G} to your mana pool.
         this.addAbility(new GreenManaAbility());
         // {tap}, Remove a charge counter from Vivid Grove: Add one mana of any color to your mana pool.
diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java b/Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java
index 5a35a1f0ac0..6e4fac47cea 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java
@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.BlueManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author anonymous
@@ -50,8 +53,9 @@ public class VividMarsh extends CardImpl<VividMarsh> {
         super(ownerId, 278, "Vivid Marsh", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Marsh enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {B} to your mana pool.
         this.addAbility(new BlueManaAbility());
         // {tap}, Remove a charge counter from Vivid Marsh: Add one mana of any color to your mana pool.
diff --git a/Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java b/Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java
index 6083dd29ba8..8af660bc366 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java
@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.WhiteManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
@@ -50,8 +53,9 @@ public class VividMeadow extends CardImpl<VividMeadow> {
         super(ownerId, 279, "Vivid Meadow", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Meadow enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {W} to your mana pool.
         this.addAbility(new WhiteManaAbility());
         // {tap}, Remove a charge counter from Vivid Meadow: Add one mana of any color to your mana pool.
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java b/Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java
index fb21c6f399f..3d7b914814b 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,9 +37,10 @@ import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.search.SearchLibraryRevealPutInHandEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterBasicLandCard;
-import mage.target.common.TargetBasicLandCard;
 import mage.target.common.TargetCardInLibrary;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java b/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java
index 5d836e9e709..364914c3450 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.keyword.ProtectionAbility;
 import mage.cards.CardImpl;
 import mage.filter.FilterCard;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java b/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java
index 18672c39221..1a312bc70aa 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -37,9 +35,10 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.continious.BoostControlledEffect;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
-import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java
index 518ebda8277..5ce270c2495 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java
@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.keyword.ChangelingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java b/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java
index 387b4625260..7cf509daba2 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java b/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java
index 5b75b4a5eb6..369053ed9f0 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.abilities.keyword.FlashAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java
index 6656ad04a95..77df675a328 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,6 +41,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java
index 83b4d607897..4dd58e5b3d6 100644
--- a/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java
+++ b/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java
@@ -40,7 +40,7 @@ import mage.abilities.effects.common.TapSourceEffect;
 public class EntersBattlefieldTappedAbility extends StaticAbility<EntersBattlefieldTappedAbility> {
 
 	public EntersBattlefieldTappedAbility() {
-		super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new TapSourceEffect()));
+		super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new TapSourceEffect(true)));
 	}
 
 	public EntersBattlefieldTappedAbility(final EntersBattlefieldTappedAbility ability) {
diff --git a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
index 858341d5458..74147b55e1b 100644
--- a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
+++ b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
@@ -98,7 +98,7 @@ public class EntersBattlefieldEffect extends ReplacementEffectImpl<EntersBattlef
 		if (text.length() == 0)
 			return "When {this} enters the battlefield, " + baseEffects.getText(mode);
 		else
-			return text;
+			return "When {this} enters the battlefield, " + text;
 	}
 
 	@Override
diff --git a/Mage/src/mage/abilities/effects/common/TapSourceEffect.java b/Mage/src/mage/abilities/effects/common/TapSourceEffect.java
index 6f03316437c..33d4e8c766a 100644
--- a/Mage/src/mage/abilities/effects/common/TapSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/TapSourceEffect.java
@@ -39,14 +39,21 @@ import mage.game.permanent.Permanent;
  * @author BetaSteward_at_googlemail.com
  */
 public class TapSourceEffect extends OneShotEffect<TapSourceEffect> {
+    private boolean withoutTrigger;
 
-	public TapSourceEffect() {
+    public TapSourceEffect() {
+        this(false);
+    }
+
+	public TapSourceEffect(boolean withoutTrigger) {
 		super(Outcome.Tap);
+        this.withoutTrigger = withoutTrigger;
 		staticText = "tap {this}";
 	}
 
 	public TapSourceEffect(final TapSourceEffect effect) {
 		super(effect);
+        this.withoutTrigger = effect.withoutTrigger;
 	}
 
 	@Override
@@ -58,7 +65,11 @@ public class TapSourceEffect extends OneShotEffect<TapSourceEffect> {
 	public boolean apply(Game game, Ability source) {
 		Permanent permanent = game.getPermanent(source.getSourceId());
 		if (permanent != null) {
-			permanent.tap(game);
+            if (withoutTrigger) {
+                permanent.setTapped(true);
+            } else {
+			    permanent.tap(game);
+            }
 			return true;
 		}
 		return false;