diff --git a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java
index 772d3a72ad..6b98ffc389 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java
@@ -28,17 +28,21 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.common.DiesAttachedTriggeredAbility;
 import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.LoseLifeTargetEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
 import mage.target.TargetPermanent;
 import mage.target.TargetPlayer;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -62,9 +66,8 @@ public class DyingWish extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
-
         // When enchanted creature dies, target player loses X life and you gain X life, where X is its power.
-        DynamicValue attachedPower = new AttachedPermanentPowerCount();
+        DynamicValue attachedPower = new DyingWishAttachedPermanentPowerCount();
         ability = new DiesAttachedTriggeredAbility(new LoseLifeTargetEffect(attachedPower), "enchanted creature");
         ability.addEffect(new GainLifeEffect(attachedPower));
         ability.addTarget(new TargetPlayer());
@@ -80,3 +83,38 @@ public class DyingWish extends CardImpl {
         return new DyingWish(this);
     }
 }
+
+class DyingWishAttachedPermanentPowerCount implements DynamicValue {
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        Permanent attachmentPermanent = game.getPermanent(sourceAbility.getSourceId());
+        if (attachmentPermanent == null) {
+            attachmentPermanent = (Permanent) game.getLastKnownInformation(sourceAbility.getSourceId(), Zone.BATTLEFIELD, sourceAbility.getSourceObjectZoneChangeCounter());
+        }
+        if (attachmentPermanent != null && attachmentPermanent.getAttachedTo() != null) {
+            if (effect.getValue("attachedTo") != null) {
+                Permanent attached = (Permanent) effect.getValue("attachedTo");
+                if (attached != null) {
+                    return attached.getPower().getValue();
+                }
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public DynamicValue copy() {
+        return new DyingWishAttachedPermanentPowerCount();
+    }
+
+    @Override
+    public String toString() {
+        return "X";
+    }
+
+    @Override
+    public String getMessage() {
+        return "its power";
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java
index 228a57579b..7b760e28e4 100644
--- a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java
+++ b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java
@@ -28,15 +28,18 @@
 package mage.sets.morningtide;
 
 import java.util.UUID;
+import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.ObjectColor;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.permanent.token.Token;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -58,7 +61,7 @@ public class VioletPall extends CardImpl {
 
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new FaerieToken(), 1));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new VioletPallFaerieToken(), 1));
     }
 
     public VioletPall(final VioletPall card) {
@@ -70,3 +73,17 @@ public class VioletPall extends CardImpl {
         return new VioletPall(this);
     }
 }
+
+class VioletPallFaerieToken extends Token {
+
+    VioletPallFaerieToken() {
+        super("Faerie Rogue", "1/1 black Faerie Rogue creature token with flying");
+        cardType.add(CardType.CREATURE);
+        color.setBlack(true);
+        subtype.add("Faerie");
+        subtype.add("Rogue");
+        power = new MageInt(1);
+        toughness = new MageInt(1);
+        this.addAbility(FlyingAbility.getInstance());
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/urzassaga/LiltingRefrain.java b/Mage.Sets/src/mage/sets/urzassaga/LiltingRefrain.java
index cf8cf62f23..e4cfe2d382 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/LiltingRefrain.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/LiltingRefrain.java
@@ -55,7 +55,7 @@ public class LiltingRefrain extends CardImpl {
 
         // At the beginning of your upkeep, you may put a verse counter on Lilting Refrain.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.VERSE.createInstance()), TargetController.YOU, true));
-        
+
         // Sacrifice Lilting Refrain: Counter target spell unless its controller pays {X}, where X is the number of verse counters on Lilting Refrain.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new CountersCount(CounterType.VERSE)), new SacrificeSourceCost());
         ability.addTarget(new TargetSpell());
@@ -70,4 +70,4 @@ public class LiltingRefrain extends CardImpl {
     public LiltingRefrain copy() {
         return new LiltingRefrain(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage/src/mage/counters/CounterType.java b/Mage/src/mage/counters/CounterType.java
index 2f0aa49ad8..18177a0339 100644
--- a/Mage/src/mage/counters/CounterType.java
+++ b/Mage/src/mage/counters/CounterType.java
@@ -1,31 +1,30 @@
 /*
-* 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.
-*/
-
+ * 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.counters;
 
 /**
@@ -34,6 +33,7 @@ package mage.counters;
  * @author nantuko
  */
 public enum CounterType {
+
     AGE("age"),
     AIM("aim"),
     ARROWHEAD("arrowhead"),
@@ -76,6 +76,7 @@ public enum CounterType {
     POISON("poison"),
     PRESSURE("pressure"),
     QUEST("quest"),
+    SHIELD("shield"),
     SLIME("slime"),
     SPORE("spore"),
     STORAGE("storage"),
@@ -85,6 +86,7 @@ public enum CounterType {
     TOWER("tower"),
     VELOCITY("velocity"),
     VILE("vile"),
+    VERSE("verse"),
     WISH("wish");
 
     private final String name;
@@ -112,7 +114,8 @@ public enum CounterType {
     }
 
     /**
-     * Create instance of counter type with defined amount of counters of the given type.
+     * Create instance of counter type with defined amount of counters of the
+     * given type.
      *
      * @param amount amount of counters of the given type.
      * @return
@@ -129,4 +132,4 @@ public enum CounterType {
                 return new Counter(name, amount);
         }
     }
-}
\ No newline at end of file
+}