diff --git a/Mage.Sets/src/mage/cards/c/CantStayAway.java b/Mage.Sets/src/mage/cards/c/CantStayAway.java
index 813896ec60..274a24fda0 100644
--- a/Mage.Sets/src/mage/cards/c/CantStayAway.java
+++ b/Mage.Sets/src/mage/cards/c/CantStayAway.java
@@ -77,7 +77,7 @@ class CantStayAwayEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         Card targetCard = game.getCard(source.getFirstTarget());
-        if (controller == null || targetCard == null) {
+        if (controller == null || targetCard == null || game.getState().getZone(targetCard.getId()) != Zone.GRAVEYARD) {
             return false;
         }
         controller.moveCards(targetCard, Zone.BATTLEFIELD, source, game);
diff --git a/Mage.Sets/src/mage/cards/s/ScrapWelder.java b/Mage.Sets/src/mage/cards/s/ScrapWelder.java
new file mode 100644
index 0000000000..1b42fd6028
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/s/ScrapWelder.java
@@ -0,0 +1,136 @@
+package mage.cards.s;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.VariableCostImpl;
+import mage.abilities.costs.VariableCostType;
+import mage.abilities.costs.common.SacrificeTargetCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.keyword.HasteAbility;
+import mage.cards.Card;
+import mage.constants.*;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.filter.common.FilterArtifactCard;
+import mage.filter.common.FilterControlledArtifactPermanent;
+import mage.filter.predicate.mageobject.ManaValuePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCardInYourGraveyard;
+import mage.target.targetadjustment.TargetAdjuster;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author weirddan455
+ */
+public final class ScrapWelder extends CardImpl {
+
+    public ScrapWelder(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
+
+        this.subtype.add(SubType.GOBLIN);
+        this.subtype.add(SubType.ARTIFICER);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // {T}, Sacrifice an artifact with mana value X: Return target artifact card with mana value less than X from your graveyard to the battlefield. It gains haste until end of turn.
+        Ability ability = new SimpleActivatedAbility(new ScrapWelderEffect(), new TapSourceCost());
+        ability.addCost(new ScrapWelderCost());
+        ability.setTargetAdjuster(ScrapWelderTargetAdjuster.instance);
+        this.addAbility(ability);
+    }
+
+    private ScrapWelder(final ScrapWelder card) {
+        super(card);
+    }
+
+    @Override
+    public ScrapWelder copy() {
+        return new ScrapWelder(this);
+    }
+}
+
+class ScrapWelderEffect extends OneShotEffect {
+
+    public ScrapWelderEffect() {
+        super(Outcome.PutCardInPlay);
+        this.staticText = "Return target artifact card with mana value less than X from your graveyard to the battlefield. It gains haste until end of turn";
+    }
+
+    private ScrapWelderEffect(final ScrapWelderEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ScrapWelderEffect copy() {
+        return new ScrapWelderEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        Card card = game.getCard(source.getFirstTarget());
+        if (controller == null || card == null || game.getState().getZone(card.getId()) != Zone.GRAVEYARD) {
+            return false;
+        }
+        controller.moveCards(card, Zone.BATTLEFIELD, source, game);
+        Permanent permanent = game.getPermanent(card.getId());
+        if (permanent != null) {
+            ContinuousEffect effect = new GainAbilityTargetEffect(HasteAbility.getInstance());
+            effect.setTargetPointer(new FixedTarget(permanent, game));
+            game.addEffect(effect, source);
+        }
+        return true;
+    }
+}
+
+class ScrapWelderCost extends VariableCostImpl {
+
+    public ScrapWelderCost() {
+        super(VariableCostType.NORMAL, "mana value");
+        this.text = "Sacrifice an artifact with mana value X";
+    }
+
+    private ScrapWelderCost(final ScrapWelderCost cost) {
+        super(cost);
+    }
+
+    @Override
+    public ScrapWelderCost copy() {
+        return new ScrapWelderCost(this);
+    }
+
+    @Override
+    public Cost getFixedCostsFromAnnouncedValue(int xValue) {
+        FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("an artifact with mana value " + xValue);
+        filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue));
+        return new SacrificeTargetCost(filter);
+    }
+}
+
+enum ScrapWelderTargetAdjuster implements TargetAdjuster {
+    instance;
+
+    @Override
+    public void adjustTargets(Ability ability, Game game) {
+        int xValue = 0;
+        for (Cost cost : ability.getCosts()) {
+            if (cost instanceof ScrapWelderCost) {
+                xValue = ((ScrapWelderCost) cost).getAmount();
+                break;
+            }
+        }
+        FilterArtifactCard filter = new FilterArtifactCard("artifact card with mana value less than " + xValue + " from your graveyard");
+        filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue));
+        ability.getTargets().clear();
+        ability.addTarget(new TargetCardInYourGraveyard(filter));
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java b/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
index abc6865aad..533558976f 100644
--- a/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
+++ b/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
@@ -103,6 +103,7 @@ public final class KamigawaNeonDynasty extends ExpansionSet {
         cards.add(new SetCardInfo("Reckoner Bankbuster", 255, Rarity.RARE, mage.cards.r.ReckonerBankbuster.class));
         cards.add(new SetCardInfo("Satoru Umezawa", 234, Rarity.RARE, mage.cards.s.SatoruUmezawa.class));
         cards.add(new SetCardInfo("Satsuki, the Living Lore", 235, Rarity.RARE, mage.cards.s.SatsukiTheLivingLore.class));
+        cards.add(new SetCardInfo("Scrap Welder", 159, Rarity.RARE, mage.cards.s.ScrapWelder.class));
         cards.add(new SetCardInfo("Seven-Tail Mentor", 36, Rarity.COMMON, mage.cards.s.SevenTailMentor.class));
         cards.add(new SetCardInfo("Siba Trespassers", 77, Rarity.COMMON, mage.cards.s.SibaTrespassers.class));
         cards.add(new SetCardInfo("Silver-Fur Master", 236, Rarity.UNCOMMON, mage.cards.s.SilverFurMaster.class));