diff --git a/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java b/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java
new file mode 100644
index 0000000000..c9935eb2c3
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java
@@ -0,0 +1,99 @@
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.SpellAbility;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.cost.CostModificationEffectImpl;
+import mage.constants.SubType;
+import mage.abilities.keyword.FlashAbility;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.CostModificationType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.AttackingPredicate;
+import mage.game.Game;
+import mage.game.permanent.token.StoneTrapIdolToken;
+import mage.util.CardUtil;
+
+/**
+ *
+ * @author TheElk801
+ */
+public final class AncientStoneIdol extends CardImpl {
+
+    public AncientStoneIdol(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{10}");
+
+        this.subtype.add(SubType.GOLEM);
+        this.power = new MageInt(12);
+        this.toughness = new MageInt(12);
+
+        // Flash
+        this.addAbility(FlashAbility.getInstance());
+
+        // This spell costs {1} less to cast for each attacking creature.
+        this.addAbility(new SimpleStaticAbility(Zone.ALL, new AncientStoneIdolCostReductionEffect()));
+
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+
+        // When Ancient Stone Idol dies, create a 6/12 colorless Construct artifact creature token with trample.
+        this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new StoneTrapIdolToken())));
+    }
+
+    public AncientStoneIdol(final AncientStoneIdol card) {
+        super(card);
+    }
+
+    @Override
+    public AncientStoneIdol copy() {
+        return new AncientStoneIdol(this);
+    }
+}
+
+class AncientStoneIdolCostReductionEffect extends CostModificationEffectImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
+
+    static {
+        filter.add(new AttackingPredicate());
+    }
+
+    public AncientStoneIdolCostReductionEffect() {
+        super(Duration.WhileOnStack, Outcome.Benefit, CostModificationType.REDUCE_COST);
+        staticText = "This spell costs {1} less to cast for each attacking creature";
+    }
+
+    protected AncientStoneIdolCostReductionEffect(AncientStoneIdolCostReductionEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source, Ability abilityToModify) {
+        int reductionAmount = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game);
+        CardUtil.reduceCost(abilityToModify, reductionAmount);
+        return true;
+    }
+
+    @Override
+    public boolean applies(Ability abilityToModify, Ability source, Game game) {
+        if ((abilityToModify instanceof SpellAbility) && abilityToModify.getSourceId().equals(source.getSourceId())) {
+            return game.getCard(abilityToModify.getSourceId()) != null;
+        }
+        return false;
+    }
+
+    @Override
+    public AncientStoneIdolCostReductionEffect copy() {
+        return new AncientStoneIdolCostReductionEffect(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java b/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java
index 3d4421c55d..ec70487013 100644
--- a/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java
+++ b/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java
@@ -1,4 +1,3 @@
-
 package mage.cards.s;
 
 import mage.abilities.Ability;
@@ -57,7 +56,7 @@ class StoneIdolTrapCostReductionEffect extends CostModificationEffectImpl {
 
     public StoneIdolTrapCostReductionEffect() {
         super(Duration.WhileOnStack, Outcome.Benefit, CostModificationType.REDUCE_COST);
-        staticText = "{this} costs {1} less to cast for each attacking creature";
+        staticText = "This spell costs {1} less to cast for each attacking creature";
     }
 
     protected StoneIdolTrapCostReductionEffect(StoneIdolTrapCostReductionEffect effect) {
diff --git a/Mage.Sets/src/mage/sets/Commander2018.java b/Mage.Sets/src/mage/sets/Commander2018.java
index 08e0ce8b58..91f1c2cfac 100644
--- a/Mage.Sets/src/mage/sets/Commander2018.java
+++ b/Mage.Sets/src/mage/sets/Commander2018.java
@@ -20,6 +20,7 @@ public final class Commander2018 extends ExpansionSet {
         super("Commander 2018 Edition", "C18", ExpansionSet.buildDate(2018, 8, 10), SetType.SUPPLEMENTAL);
         this.blockName = "Command Zone";
 
+        cards.add(new SetCardInfo("Ancient Stone Idol", 53, Rarity.RARE, mage.cards.a.AncientStoneIdol.class));
         cards.add(new SetCardInfo("Avenger of Zendikar", 129, Rarity.MYTHIC, mage.cards.a.AvengerOfZendikar.class));
         cards.add(new SetCardInfo("Budoka Gardener", 134, Rarity.RARE, mage.cards.b.BudokaGardener.class));
         cards.add(new SetCardInfo("Chain Reaction", 121, Rarity.RARE, mage.cards.c.ChainReaction.class));