diff --git a/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java b/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java
index c9fa5f9c270..14f678a3fd5 100644
--- a/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java
+++ b/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java
@@ -82,7 +82,7 @@ class GemstoneCavernsAbility extends StaticAbility implements OpeningHandAction
 
     @Override
     public String getRule() {
-        return "If {this} is in your opening hand and you're not the starting player, you may begin the game with {this} on the battlefield with a luck counter on it. If you do, exile a card from your hand.";
+        return "If this card is in your opening hand and you're not the starting player, you may begin the game with {this} on the battlefield with a luck counter on it. If you do, exile a card from your hand.";
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/w/WanderingFumarole.java b/Mage.Sets/src/mage/cards/w/WanderingFumarole.java
index 424a3705310..e3bec4359b2 100644
--- a/Mage.Sets/src/mage/cards/w/WanderingFumarole.java
+++ b/Mage.Sets/src/mage/cards/w/WanderingFumarole.java
@@ -1,12 +1,8 @@
-
 package mage.cards.w;
 
-import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
 import mage.abilities.effects.common.continuous.SwitchPowerToughnessSourceEffect;
 import mage.abilities.mana.BlueManaAbility;
@@ -14,32 +10,35 @@ import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Duration;
-import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
+import mage.constants.SubType;
+import mage.game.permanent.token.custom.CreatureToken;
+
+import java.util.UUID;
 
 /**
- *
  * @author fireshoes
  */
 public final class WanderingFumarole extends CardImpl {
 
     public WanderingFumarole(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
 
         // Wandering Fumarole enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
-        
+
         // {T}: Add {U} or {R}.
         this.addAbility(new BlueManaAbility());
         this.addAbility(new RedManaAbility());
-        
+
         // {2}{U}{R}: Until end of turn, Wandering Fumarole becomes a 1/4 blue and red Elemental creature with 
         // "0: Switch this creature's power and toughness until end of turn." It's still a land.
-        Effect effect = new BecomesCreatureSourceEffect(new WanderingFumaroleToken(), CardType.LAND, Duration.EndOfTurn);
-        effect.setText("{this} becomes a 1/4 blue and red Elemental creature with \"0: Switch this creature's power and toughness until end of turn.\" It's still a land");
-        this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{U}{R}")));
+        this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new CreatureToken(
+                1, 4, "1/4 blue and red Elemental creature " +
+                "with \"{0}: Switch this creature's power and toughness until end of turn.\"", SubType.ELEMENTAL
+        ).withColor("UR").withAbility(new SimpleActivatedAbility(
+                new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{0}")
+        )), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{2}{U}{R}")));
     }
 
     private WanderingFumarole(final WanderingFumarole card) {
@@ -51,24 +50,3 @@ public final class WanderingFumarole extends CardImpl {
         return new WanderingFumarole(this);
     }
 }
-
-class WanderingFumaroleToken extends TokenImpl {
-
-    public WanderingFumaroleToken() {
-        super("", "1/4 blue and red Elemental creature with \"0: Switch this creature's power and toughness until end of turn.\"");
-        cardType.add(CardType.CREATURE);
-        subtype.add(SubType.ELEMENTAL);
-        color.setRed(true);
-        color.setBlue(true);
-        power = new MageInt(1);
-        toughness = new MageInt(4);
-        addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{0}")));
-    }
-    private WanderingFumaroleToken(final WanderingFumaroleToken token) {
-        super(token);
-    }
-
-    public WanderingFumaroleToken copy() {
-        return new WanderingFumaroleToken(this);
-    }
-}