diff --git a/Mage.Sets/src/mage/sets/kaladesh/SalivatingGremlins.java b/Mage.Sets/src/mage/sets/kaladesh/SalivatingGremlins.java
new file mode 100644
index 0000000000..e7e6e8b855
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/SalivatingGremlins.java
@@ -0,0 +1,78 @@
+/*
+ *  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.sets.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledArtifactPermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class SalivatingGremlins extends CardImpl {
+
+    public SalivatingGremlins(UUID ownerId) {
+        super(ownerId, 129, "Salivating Gremlins", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
+        this.expansionSetCode = "KLD";
+        this.subtype.add("Gremlin");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(3);
+
+        // Whenever an artifact enters the battlefield under your control, Salivating Gremlins gets +2/+0 and gains trample until end of turn.
+        Effect effect = new BoostSourceEffect(2, 0, Duration.EndOfTurn);
+        effect.setText("{this} gets +2/+0");
+        Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD,
+                effect,
+                new FilterControlledArtifactPermanent("an artifact"), false, null, true);
+        effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn);
+        effect.setText("and gains trample until end of turn");
+        ability.addEffect(effect);
+        this.addAbility(ability);
+    }
+
+    public SalivatingGremlins(final SalivatingGremlins card) {
+        super(card);
+    }
+
+    @Override
+    public SalivatingGremlins copy() {
+        return new SalivatingGremlins(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/StartYourEngines.java b/Mage.Sets/src/mage/sets/kaladesh/StartYourEngines.java
new file mode 100644
index 0000000000..268a09f17e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/StartYourEngines.java
@@ -0,0 +1,104 @@
+/*
+ *  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.sets.kaladesh;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.SubLayer;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class StartYourEngines extends CardImpl {
+
+    public StartYourEngines(UUID ownerId) {
+        super(ownerId, 135, "Start Your Engines", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}");
+        this.expansionSetCode = "KLD";
+
+        // Vehicles you control becomes artifact creatures until end of turn.
+        this.getSpellAbility().addEffect(new StartYourEnginesEffect());
+        // Creatures you control get +2/+0 until end of turn.
+        this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn));
+    }
+
+    public StartYourEngines(final StartYourEngines card) {
+        super(card);
+    }
+
+    @Override
+    public StartYourEngines copy() {
+        return new StartYourEngines(this);
+    }
+}
+
+class StartYourEnginesEffect extends ContinuousEffectImpl {
+
+    public StartYourEnginesEffect() {
+        super(Duration.EndOfTurn, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.BecomeCreature);
+        staticText = "Vehicles you control becomes artifact creatures until end of turn";
+    }
+
+    public StartYourEnginesEffect(final StartYourEnginesEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public StartYourEnginesEffect copy() {
+        return new StartYourEnginesEffect(this);
+    }
+
+    @Override
+    public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+        for (Permanent permanent : game.getBattlefield().getAllActivePermanents(source.getControllerId())) {
+            if (permanent != null && permanent.getSubtype(game).contains("Vehicle")) {
+                if (sublayer == SubLayer.NA) {
+                    permanent.getCardType().add(CardType.ARTIFACT);
+                    permanent.getCardType().add(CardType.CREATURE);// TODO: Chcek if giving CREATURE Type is correct
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return false;
+    }
+
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/TerritorialGorger.java b/Mage.Sets/src/mage/sets/kaladesh/TerritorialGorger.java
new file mode 100644
index 0000000000..f0fe6a42b2
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/TerritorialGorger.java
@@ -0,0 +1,105 @@
+/*
+ *  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.sets.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class TerritorialGorger extends CardImpl {
+
+    public TerritorialGorger(UUID ownerId) {
+        super(ownerId, 136, "Territorial Gorger", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}");
+        this.expansionSetCode = "KLD";
+        this.subtype.add("Gremlin");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+        // Whenever you get one or more {E}, Territorial Gorger gets +2/+2 until end of turn.
+        this.addAbility(new TerritorialGorgerTriggeredAbility());
+    }
+
+    public TerritorialGorger(final TerritorialGorger card) {
+        super(card);
+    }
+
+    @Override
+    public TerritorialGorger copy() {
+        return new TerritorialGorger(this);
+    }
+}
+
+class TerritorialGorgerTriggeredAbility extends TriggeredAbilityImpl {
+
+    TerritorialGorgerTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), false);
+    }
+
+    TerritorialGorgerTriggeredAbility(final TerritorialGorgerTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public TerritorialGorgerTriggeredAbility copy() {
+        return new TerritorialGorgerTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.COUNTERS_ADDED;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getData().equals(CounterType.ENERGY.getName())) {
+            return event.getTargetId() == this.getControllerId();
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever you get one or more {E} <i>(energy counters)</i>, " + super.getRule();
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/ThrivingGrubs.java b/Mage.Sets/src/mage/sets/kaladesh/ThrivingGrubs.java
new file mode 100644
index 0000000000..2b7cea0ec2
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/ThrivingGrubs.java
@@ -0,0 +1,72 @@
+/*
+ *  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.sets.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.costs.common.PayEnergyCost;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.counters.CounterType;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ThrivingGrubs extends CardImpl {
+
+    public ThrivingGrubs(UUID ownerId) {
+        super(ownerId, 138, "Thriving Grubs", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}");
+        this.expansionSetCode = "KLD";
+        this.subtype.add("Gremlin");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(1);
+
+        // When Thriving Grubs enters the battlefield, you get {E}{E}.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2), false));
+
+        // Whenever Thriving Grubs attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it.
+        this.addAbility(new AttacksTriggeredAbility(new DoIfCostPaid(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new PayEnergyCost(2)), false,
+                "Whenever {this} attacks you may pay {E}{E}. If you do, put a +1/+1 counter on it."));
+    }
+
+    public ThrivingGrubs(final ThrivingGrubs card) {
+        super(card);
+    }
+
+    @Override
+    public ThrivingGrubs copy() {
+        return new ThrivingGrubs(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/WeldfastWingsmith.java b/Mage.Sets/src/mage/sets/kaladesh/WeldfastWingsmith.java
index aef2f4134c..f43f92f85d 100644
--- a/Mage.Sets/src/mage/sets/kaladesh/WeldfastWingsmith.java
+++ b/Mage.Sets/src/mage/sets/kaladesh/WeldfastWingsmith.java
@@ -54,7 +54,7 @@ public class WeldfastWingsmith extends CardImpl {
 
         // Whenever an artifact enters the battlefield under your control, Weldfast Wingsmith gains flying until end of turn.
         this.addAbility(new EntersBattlefieldAllTriggeredAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn),
-                new FilterControlledArtifactPermanent(), "Whenever an artifact enters the battlefield under your control, Weldfast Wingsmith gains flying until end of turn."));
+                new FilterControlledArtifactPermanent(), "Whenever an artifact enters the battlefield under your control, {this} gains flying until end of turn."));
     }
 
     public WeldfastWingsmith(final WeldfastWingsmith card) {
diff --git a/Mage.Sets/src/mage/sets/kaladesh/WeldingSparks.java b/Mage.Sets/src/mage/sets/kaladesh/WeldingSparks.java
new file mode 100644
index 0000000000..c2eff56dfd
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/WeldingSparks.java
@@ -0,0 +1,66 @@
+/*
+ *  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.sets.kaladesh;
+
+import java.util.UUID;
+import mage.abilities.dynamicvalue.IntPlusDynamicValue;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.common.FilterControlledArtifactPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class WeldingSparks extends CardImpl {
+
+    public WeldingSparks(UUID ownerId) {
+        super(ownerId, 140, "Welding Sparks", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}");
+        this.expansionSetCode = "KLD";
+
+        // Welding Sparks deals X damage to target creature, where X is 3 plus the number of artifacts you control.
+        Effect effect = new DamageTargetEffect(new IntPlusDynamicValue(3, new PermanentsOnBattlefieldCount(new FilterControlledArtifactPermanent("artifacts you control"))));
+        effect.setText("{this} deals X damage to target creature, where X is 3 plus the number of artifacts you control");
+        this.getSpellAbility().addEffect(effect);
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+    }
+
+    public WeldingSparks(final WeldingSparks card) {
+        super(card);
+    }
+
+    @Override
+    public WeldingSparks copy() {
+        return new WeldingSparks(this);
+    }
+}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java
index f146091597..49d348290d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java
@@ -135,7 +135,7 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl {
     @Override
     public String getText(Mode mode) {
         StringBuilder sb = new StringBuilder();
-        if (duration.toString() != "") {
+        if (!"".equals(duration.toString())) {
             sb.append(duration.toString()).append(", ");
         }
         sb.append(filter.getMessage());