diff --git a/Mage.Sets/src/mage/cards/w/WorldheartPhoenix.java b/Mage.Sets/src/mage/cards/w/WorldheartPhoenix.java
index f5a2525d015..88977f95521 100644
--- a/Mage.Sets/src/mage/cards/w/WorldheartPhoenix.java
+++ b/Mage.Sets/src/mage/cards/w/WorldheartPhoenix.java
@@ -1,23 +1,23 @@
-
 package mage.cards.w;
 
 import mage.MageIdentifier;
 import mage.MageInt;
+import mage.MageObjectReference;
 import mage.abilities.Ability;
-import mage.abilities.SpellAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.AsThoughEffectImpl;
-import mage.abilities.effects.EntersBattlefieldEffect;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.counter.AddCounterEnteringCreatureEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.counters.CounterType;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
+import mage.game.events.GameEvent;
+import mage.game.stack.Spell;
 import mage.players.Player;
+import mage.watchers.Watcher;
 
 import java.util.UUID;
 
@@ -40,8 +40,7 @@ public final class WorldheartPhoenix extends CardImpl {
         // If you do, it enters the battlefield with two +1/+1 counters on it.
         Ability ability = new SimpleStaticAbility(Zone.ALL, new WorldheartPhoenixPlayEffect())
                 .setIdentifier(MageIdentifier.WorldheartPhoenixAlternateCast);
-        ability.addEffect(new EntersBattlefieldEffect(new WorldheartPhoenixEntersBattlefieldEffect(),
-                "If you do, it enters the battlefield with two +1/+1 counters on it"));
+        ability.addWatcher(new WorldheartPhoenixWatcher());
         this.addAbility(ability);
 
     }
@@ -54,80 +53,65 @@ public final class WorldheartPhoenix extends CardImpl {
     public WorldheartPhoenix copy() {
         return new WorldheartPhoenix(this);
     }
+}
 
-    class WorldheartPhoenixPlayEffect extends AsThoughEffectImpl {
-
-        public WorldheartPhoenixPlayEffect() {
-            super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
-            staticText = "You may cast {this} from your graveyard by paying {W}{U}{B}{R}{G} rather than paying its mana cost";
-        }
-
-        private WorldheartPhoenixPlayEffect(final WorldheartPhoenixPlayEffect effect) {
-            super(effect);
-        }
-
-        @Override
-        public boolean apply(Game game, Ability source) {
-            return true;
-        }
-
-        @Override
-        public WorldheartPhoenixPlayEffect copy() {
-            return new WorldheartPhoenixPlayEffect(this);
-        }
-
-        @Override
-        public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
-            if (sourceId.equals(source.getSourceId()) && source.isControlledBy(affectedControllerId)) {
-                if (game.getState().getZone(source.getSourceId()) == Zone.GRAVEYARD) {
-                    Player player = game.getPlayer(affectedControllerId);
-                    if (player != null) {
-                        player.setCastSourceIdWithAlternateMana(
-                                sourceId, new ManaCostsImpl<>("{W}{U}{B}{R}{G}"), null,
-                                MageIdentifier.WorldheartPhoenixAlternateCast
-                        );
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
+class WorldheartPhoenixPlayEffect extends AsThoughEffectImpl {
 
+    WorldheartPhoenixPlayEffect() {
+        super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+        staticText = "You may cast {this} from your graveyard by paying {W}{U}{B}{R}{G} rather than paying its mana cost. " +
+                "If you do, it enters the battlefield with two +1/+1 counters on it";
     }
 
-    class WorldheartPhoenixEntersBattlefieldEffect extends OneShotEffect {
+    private WorldheartPhoenixPlayEffect(final WorldheartPhoenixPlayEffect effect) {
+        super(effect);
+    }
 
-        public WorldheartPhoenixEntersBattlefieldEffect() {
-            super(Outcome.BoostCreature);
-            staticText = "If you do, it enters the battlefield with two +1/+1 counters on it";
-        }
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
 
-        private WorldheartPhoenixEntersBattlefieldEffect(final WorldheartPhoenixEntersBattlefieldEffect effect) {
-            super(effect);
-        }
+    @Override
+    public WorldheartPhoenixPlayEffect copy() {
+        return new WorldheartPhoenixPlayEffect(this);
+    }
 
-        @Override
-        public boolean apply(Game game, Ability source) {
-            Permanent permanent = game.getPermanentEntering(source.getSourceId());
-            if (permanent != null) {
-                SpellAbility spellAbility = (SpellAbility) getValue(EntersBattlefieldEffect.SOURCE_CAST_SPELL_ABILITY);
-                if (spellAbility != null
-                        && spellAbility.getSourceId().equals(source.getSourceId())
-                        && permanent.getZoneChangeCounter(game) == spellAbility.getSourceObjectZoneChangeCounter()) {
-                    // TODO: No perfect solution because there could be other effects that allow to cast the card for this mana cost
-                    if (spellAbility.getManaCosts().getText().equals("{W}{U}{B}{R}{G}")) {
-                        permanent.addCounters(CounterType.P1P1.createInstance(2), source.getControllerId(), source, game);
-                    }
+    @Override
+    public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
+        if (sourceId.equals(source.getSourceId()) && source.isControlledBy(affectedControllerId)) {
+            if (game.getState().getZone(source.getSourceId()) == Zone.GRAVEYARD) {
+                Player player = game.getPlayer(affectedControllerId);
+                if (player != null) {
+                    player.setCastSourceIdWithAlternateMana(
+                            sourceId, new ManaCostsImpl<>("{W}{U}{B}{R}{G}"), null,
+                            MageIdentifier.WorldheartPhoenixAlternateCast
+                    );
+                    return true;
                 }
             }
-            return true;
         }
-
-        @Override
-        public WorldheartPhoenixEntersBattlefieldEffect copy() {
-            return new WorldheartPhoenixEntersBattlefieldEffect(this);
-        }
-
+        return false;
     }
 
 }
+
+class WorldheartPhoenixWatcher extends Watcher {
+
+    WorldheartPhoenixWatcher() {
+        super(WatcherScope.GAME);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (GameEvent.EventType.SPELL_CAST.equals(event.getType())
+                && event.hasApprovingIdentifier(MageIdentifier.WorldheartPhoenixAlternateCast)) {
+            Spell target = game.getSpell(event.getTargetId());
+            if (target != null) {
+                game.getState().addEffect(new AddCounterEnteringCreatureEffect(new MageObjectReference(target.getCard(), game),
+                                CounterType.P1P1.createInstance(2), Outcome.BoostCreature),
+                        target.getSpellAbility());
+            }
+        }
+    }
+}