diff --git a/Mage.Sets/src/mage/cards/a/AetherflameWall.java b/Mage.Sets/src/mage/cards/a/AetherflameWall.java
new file mode 100644
index 0000000000..9579f21ccc
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AetherflameWall.java
@@ -0,0 +1,50 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.CanBlockAsThoughtItHadShadowEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.keyword.DefenderAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.Zone;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author noahg
+ */
+public final class AetherflameWall extends CardImpl {
+
+    public AetherflameWall(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}");
+        
+        this.subtype.add(SubType.WALL);
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(4);
+
+        // Defender
+        this.addAbility(DefenderAbility.getInstance());
+
+        // Aetherflame Wall can block creatures with shadow as though they didn’t have shadow.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield)));
+
+        // {R}: Aetherflame Wall gets +1/+0 until end of turn.
+        this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
+    }
+
+    public AetherflameWall(final AetherflameWall card) {
+        super(card);
+    }
+
+    @Override
+    public AetherflameWall copy() {
+        return new AetherflameWall(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/cards/h/HeartwoodDryad.java b/Mage.Sets/src/mage/cards/h/HeartwoodDryad.java
index 3fe01db33e..88c2bc0c89 100644
--- a/Mage.Sets/src/mage/cards/h/HeartwoodDryad.java
+++ b/Mage.Sets/src/mage/cards/h/HeartwoodDryad.java
@@ -6,6 +6,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.AsThoughEffectImpl;
+import mage.abilities.effects.common.CanBlockAsThoughtItHadShadowEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.AsThoughEffectType;
@@ -29,7 +30,7 @@ public final class HeartwoodDryad extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Heartwood Dryad can block creatures with shadow as though Heartwood Dryad had shadow.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAsThoughtIthadShadowEffect(Duration.WhileOnBattlefield)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield)));
     }
 
     public HeartwoodDryad(final HeartwoodDryad card) {
@@ -40,32 +41,4 @@ public final class HeartwoodDryad extends CardImpl {
     public HeartwoodDryad copy() {
         return new HeartwoodDryad(this);
     }
-}
-
-class CanBlockAsThoughtIthadShadowEffect extends AsThoughEffectImpl {
-
-    public CanBlockAsThoughtIthadShadowEffect(Duration duration) {
-        super(AsThoughEffectType.BLOCK_SHADOW, duration, Outcome.Benefit);
-        staticText = "{this} can block creatures with shadow as though {this} had shadow";
-    }
-
-    public CanBlockAsThoughtIthadShadowEffect(final CanBlockAsThoughtIthadShadowEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        return true;
-    }
-
-    @Override
-    public CanBlockAsThoughtIthadShadowEffect copy() {
-        return new CanBlockAsThoughtIthadShadowEffect(this);
-    }
-
-    @Override
-    public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
-        return sourceId.equals(source.getSourceId());
-    }
-
 }
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java b/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java
index 0371561cfd..2e33018082 100644
--- a/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java
+++ b/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java
@@ -6,6 +6,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.AsThoughEffectImpl;
+import mage.abilities.effects.common.CanBlockAsThoughtItHadShadowEffect;
 import mage.abilities.keyword.DefenderAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -33,7 +34,7 @@ public final class WallOfDiffusion extends CardImpl {
         // Defender
         this.addAbility(DefenderAbility.getInstance());
         // Wall of Diffusion can block creatures with shadow as though Wall of Diffusion had shadow.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAsThoughtIthadShadowEffect(Duration.WhileOnBattlefield)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield)));
     }
 
     public WallOfDiffusion(final WallOfDiffusion card) {
@@ -44,32 +45,4 @@ public final class WallOfDiffusion extends CardImpl {
     public WallOfDiffusion copy() {
         return new WallOfDiffusion(this);
     }
-}
-
-class CanBlockAsThoughtIthadShadowEffect extends AsThoughEffectImpl {
-
-    public CanBlockAsThoughtIthadShadowEffect(Duration duration) {
-        super(AsThoughEffectType.BLOCK_SHADOW, duration, Outcome.Benefit);
-        staticText = "{this} can block creatures with shadow as though {this} had shadow";
-    }
-
-    public CanBlockAsThoughtIthadShadowEffect(final CanBlockAsThoughtIthadShadowEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        return true;
-    }
-
-    @Override
-    public CanBlockAsThoughtIthadShadowEffect copy() {
-        return new CanBlockAsThoughtIthadShadowEffect(this);
-    }
-
-    @Override
-    public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
-        return sourceId.equals(source.getSourceId());
-    }
-
-}
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/TimeSpiral.java b/Mage.Sets/src/mage/sets/TimeSpiral.java
index dd82083812..44f41aa06d 100644
--- a/Mage.Sets/src/mage/sets/TimeSpiral.java
+++ b/Mage.Sets/src/mage/sets/TimeSpiral.java
@@ -26,6 +26,7 @@ public final class TimeSpiral extends ExpansionSet {
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;
         cards.add(new SetCardInfo("Academy Ruins", 269, Rarity.RARE, mage.cards.a.AcademyRuins.class));
+        cards.add(new SetCardInfo("Aetherflame Wall", 142, Rarity.COMMON, mage.cards.a.AetherflameWall.class));
         cards.add(new SetCardInfo("Amrou Scout", 1, Rarity.COMMON, mage.cards.a.AmrouScout.class));
         cards.add(new SetCardInfo("Amrou Seekers", 2, Rarity.COMMON, mage.cards.a.AmrouSeekers.class));
         cards.add(new SetCardInfo("Ancestral Vision", 48, Rarity.RARE, mage.cards.a.AncestralVision.class));
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java
new file mode 100644
index 0000000000..2725b18636
--- /dev/null
+++ b/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java
@@ -0,0 +1,38 @@
+package mage.abilities.effects.common;
+
+import mage.abilities.Ability;
+import mage.abilities.effects.AsThoughEffectImpl;
+import mage.constants.AsThoughEffectType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.game.Game;
+
+import java.util.UUID;
+
+public class CanBlockAsThoughtItHadShadowEffect extends AsThoughEffectImpl {
+
+    public CanBlockAsThoughtItHadShadowEffect(Duration duration) {
+        super(AsThoughEffectType.BLOCK_SHADOW, duration, Outcome.Benefit);
+        staticText = "{this} can block creatures with shadow as though {this} had shadow";
+    }
+
+    public CanBlockAsThoughtItHadShadowEffect(final CanBlockAsThoughtItHadShadowEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public CanBlockAsThoughtItHadShadowEffect copy() {
+        return new CanBlockAsThoughtItHadShadowEffect(this);
+    }
+
+    @Override
+    public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
+        return sourceId.equals(source.getSourceId());
+    }
+
+}