diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java b/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java
index 1963f833b92..091a8fe99e5 100644
--- a/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java
+++ b/Mage.Sets/src/mage/sets/magic2010/DragonWhelp.java
@@ -30,6 +30,7 @@ package mage.sets.magic2010;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
+import mage.abilities.ActivationInfo;
 import mage.abilities.DelayedTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
@@ -45,7 +46,6 @@ import mage.constants.Outcome;
 import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.game.Game;
-import mage.util.CardUtil;
 
 /**
  *
@@ -84,17 +84,6 @@ public class DragonWhelp extends CardImpl {
 
 class DragonWhelpEffect extends OneShotEffect {
 
-    class ActivationInfo {
-
-        public int turnNum;
-        public int activationCounter;
-
-        public ActivationInfo(int turnNum, int activationCounter) {
-            this.turnNum = turnNum;
-            this.activationCounter = activationCounter;
-        }
-    }
-
     public DragonWhelpEffect() {
         super(Outcome.Damage);
         this.staticText = "If this ability has been activated four or more times this turn, sacrifice {this} at the beginning of the next end step";
@@ -111,28 +100,13 @@ class DragonWhelpEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        ActivationInfo activationInfo = getActivationInfo(source, game);
-        ++activationInfo.activationCounter;
-        setActivationInfo(activationInfo, source, game);
-        if (activationInfo.activationCounter == 4) {
+        ActivationInfo activationInfo = ActivationInfo.getInstance(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
+        activationInfo.addActivation(game);
+        if (activationInfo.getActivationCounter() == 4) {
             DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SacrificeSourceEffect());
             game.addDelayedTriggeredAbility(delayedAbility, source);
         }
         return true;
     }
 
-    private ActivationInfo getActivationInfo(Ability source, Game game) {
-        Integer turnNum = (Integer) game.getState().getValue(CardUtil.getCardZoneString("activationsTurn", source.getSourceId(), game));
-        Integer activationCount = (Integer) game.getState().getValue(CardUtil.getCardZoneString("activationsCount", source.getSourceId(), game));
-        if (turnNum == null || activationCount == null) {
-            turnNum = game.getTurnNum();
-            activationCount = 0;
-        }
-        return new ActivationInfo(turnNum, activationCount);
-    }
-
-    private void setActivationInfo(ActivationInfo activationInfo, Ability source, Game game) {
-        game.getState().setValue(CardUtil.getCardZoneString("activationsTurn", source.getSourceId(), game), activationInfo.turnNum);
-        game.getState().setValue(CardUtil.getCardZoneString("activationsCount", source.getSourceId(), game), activationInfo.activationCounter);
-    }
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/LimitedCountedActivationsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/LimitedCountedActivationsTest.java
new file mode 100644
index 00000000000..15fdefd210f
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/LimitedCountedActivationsTest.java
@@ -0,0 +1,158 @@
+/*
+ *  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 org.mage.test.cards.abilities.other;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class LimitedCountedActivationsTest extends CardTestPlayerBase {
+
+    /**
+     * Tests usage of ActivationInfo class
+     */
+    @Test
+    public void testDragonWhelpActivatedThreeTimes() {
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
+        // Flying
+        // {R}: Dragon Whelp gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Dragon Whelp at the beginning of the next end step.
+        addCard(Zone.BATTLEFIELD, playerA, "Dragon Whelp", 1); // 3/3
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+
+        attack(1, playerA, "Dragon Whelp");
+
+        setStopAt(2, PhaseStep.UPKEEP);
+        execute();
+
+        assertPermanentCount(playerA, "Dragon Whelp", 1);
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 15);
+    }
+
+    @Test
+    public void testDragonWhelpActivatedFourTimes() {
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
+        // Flying
+        // {R}: Dragon Whelp gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Dragon Whelp at the beginning of the next end step.
+        addCard(Zone.BATTLEFIELD, playerA, "Dragon Whelp", 1); // 3/3
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+
+        attack(1, playerA, "Dragon Whelp");
+
+        setStopAt(2, PhaseStep.UPKEEP);
+        execute();
+
+        assertPermanentCount(playerA, "Dragon Whelp", 0);
+        assertGraveyardCount(playerA, "Dragon Whelp", 1);
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 14);
+    }
+
+    @Test
+    public void testDragonWhelpActivatedFiveTimes() {
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
+        // Flying
+        // {R}: Dragon Whelp gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Dragon Whelp at the beginning of the next end step.
+        addCard(Zone.BATTLEFIELD, playerA, "Dragon Whelp", 1); // 3/3
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: ");
+
+        attack(1, playerA, "Dragon Whelp");
+
+        setStopAt(2, PhaseStep.UPKEEP);
+        execute();
+
+        assertPermanentCount(playerA, "Dragon Whelp", 0);
+        assertGraveyardCount(playerA, "Dragon Whelp", 1);
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 13);
+    }
+
+    @Test
+    public void testDragonWhelpTwoObjects() {
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
+        // Flying
+        // {R}: Dragon Whelp gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Dragon Whelp at the beginning of the next end step.
+        addCard(Zone.BATTLEFIELD, playerA, "Dragon Whelp", 1); // 3/3
+        // Put target creature card from a graveyard onto the battlefield under your control. You lose life equal to its converted mana cost.
+        addCard(Zone.HAND, playerA, "Reanimate", 1);
+        // Target creature gains haste until end of turn.
+        addCard(Zone.HAND, playerA, "Unnatural Speed", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2);
+        // Destroy target nonartifact, nonblack creature. It can't be regenerated.
+        addCard(Zone.HAND, playerB, "Terror", 1); // {1}{B}
+
+        activateAbility(1, PhaseStep.UPKEEP, playerA, "{R}: ");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Terror", "Dragon Whelp");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reanimate", "Dragon Whelp");
+        castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Unnatural Speed", "Dragon Whelp");
+
+        activateAbility(1, PhaseStep.DECLARE_ATTACKERS, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.DECLARE_ATTACKERS, playerA, "{R}: ");
+        activateAbility(1, PhaseStep.DECLARE_ATTACKERS, playerA, "{R}: ");
+
+        attack(1, playerA, "Dragon Whelp");
+
+        setStopAt(2, PhaseStep.UPKEEP);
+        execute();
+
+        assertGraveyardCount(playerA, "Unnatural Speed", 1);
+        assertGraveyardCount(playerA, "Reanimate", 1);
+
+        assertGraveyardCount(playerB, "Terror", 1);
+
+        assertPermanentCount(playerA, "Dragon Whelp", 1);
+        assertPowerToughness(playerA, "Dragon Whelp", 2, 3);
+        assertGraveyardCount(playerA, "Dragon Whelp", 0);
+
+        assertLife(playerA, 16);
+        assertLife(playerB, 15);
+    }
+}
diff --git a/Mage/src/main/java/mage/abilities/ActivationInfo.java b/Mage/src/main/java/mage/abilities/ActivationInfo.java
new file mode 100644
index 00000000000..84d6b1b8db0
--- /dev/null
+++ b/Mage/src/main/java/mage/abilities/ActivationInfo.java
@@ -0,0 +1,77 @@
+/*
+ *  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.abilities;
+
+import java.util.UUID;
+import mage.game.Game;
+
+/**
+ * The ActivationInfo class holds the information how often an ability of an
+ * object was activated during a turn. It handles the check, if the object is
+ * still the same, so for example if a permanent left battlefield and returns,
+ * the counting of activations happens for each object.
+ *
+ * @author LevelX2
+ */
+public class ActivationInfo {
+
+    protected int turnNum;
+    protected int activationCounter;
+
+    public static ActivationInfo getInstance(Game game, UUID sourceId) {
+        return ActivationInfo.getInstance(game, sourceId, game.getState().getZoneChangeCounter(sourceId));
+    }
+
+    public static ActivationInfo getInstance(Game game, UUID sourceId, int zoneChangeCounter) {
+        String key = "ActivationInfo" + sourceId.toString() + zoneChangeCounter;
+        ActivationInfo activationInfo = (ActivationInfo) game.getState().getValue(key);
+        if (activationInfo == null) {
+            activationInfo = new ActivationInfo(game);
+            game.getState().setValue(key, activationInfo);
+        }
+        return activationInfo;
+    }
+
+    protected ActivationInfo(Game game) {
+        this.turnNum = game.getTurnNum();
+        this.activationCounter = 0;
+    }
+
+    public void addActivation(Game game) {
+        if (game.getTurnNum() != turnNum) {
+            activationCounter = 1;
+            turnNum = game.getTurnNum();
+        } else {
+            activationCounter++;
+        }
+    }
+
+    public int getActivationCounter() {
+        return activationCounter;
+    }
+}