diff --git a/Mage.Sets/src/mage/cards/a/AnointerOfValor.java b/Mage.Sets/src/mage/cards/a/AnointerOfValor.java
new file mode 100644
index 00000000000..8288b73ffc0
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AnointerOfValor.java
@@ -0,0 +1,55 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.common.AttacksAllTriggeredAbility;
+import mage.abilities.common.delayed.ReflexiveTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.DoWhenCostPaid;
+import mage.abilities.effects.common.counter.AddCountersTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SetTargetPointer;
+import mage.constants.SubType;
+import mage.counters.CounterType;
+import mage.filter.StaticFilters;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AnointerOfValor extends CardImpl {
+
+    public AnointerOfValor(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}");
+
+        this.subtype.add(SubType.ANGEL);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(5);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Whenever a creature attacks, you may pay {3}. When you do, put a +1/+1 counter on that creature.
+        this.addAbility(new AttacksAllTriggeredAbility(
+                new DoWhenCostPaid(
+                        new ReflexiveTriggeredAbility(
+                                new AddCountersTargetEffect(CounterType.P1P1.createInstance()),
+                                false, "put a +1/+1 counter on that creature"
+                        ), new GenericManaCost(3), "Pay {3}?"
+                ), false, StaticFilters.FILTER_PERMANENT_CREATURE_A,
+                SetTargetPointer.PERMANENT, false
+        ));
+    }
+
+    private AnointerOfValor(final AnointerOfValor card) {
+        super(card);
+    }
+
+    @Override
+    public AnointerOfValor copy() {
+        return new AnointerOfValor(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/CommanderLegends.java b/Mage.Sets/src/mage/sets/CommanderLegends.java
index 52e1ca176ab..51f83312e03 100644
--- a/Mage.Sets/src/mage/sets/CommanderLegends.java
+++ b/Mage.Sets/src/mage/sets/CommanderLegends.java
@@ -46,6 +46,7 @@ public final class CommanderLegends extends ExpansionSet {
         cards.add(new SetCardInfo("Angelic Armaments", 296, Rarity.UNCOMMON, mage.cards.a.AngelicArmaments.class));
         cards.add(new SetCardInfo("Angelic Gift", 7, Rarity.COMMON, mage.cards.a.AngelicGift.class));
         cards.add(new SetCardInfo("Annoyed Altisaur", 216, Rarity.COMMON, mage.cards.a.AnnoyedAltisaur.class));
+        cards.add(new SetCardInfo("Anointer of Valor", 8, Rarity.COMMON, mage.cards.a.AnointerOfValor.class));
         cards.add(new SetCardInfo("Apex Devastator", 217, Rarity.MYTHIC, mage.cards.a.ApexDevastator.class));
         cards.add(new SetCardInfo("Aqueous Form", 56, Rarity.COMMON, mage.cards.a.AqueousForm.class));
         cards.add(new SetCardInfo("Arcane Denial", 393, Rarity.COMMON, mage.cards.a.ArcaneDenial.class));
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoWhenCostPaid.java b/Mage/src/main/java/mage/abilities/effects/common/DoWhenCostPaid.java
index 8d0dea08dd8..3a9139ce8ae 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DoWhenCostPaid.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DoWhenCostPaid.java
@@ -56,6 +56,7 @@ public class DoWhenCostPaid extends OneShotEffect {
         cost.clearPaid();
         int bookmark = game.bookmarkState();
         if (cost.pay(source, game, source.getSourceId(), player.getId(), false)) {
+            ability.getEffects().setTargetPointer(getTargetPointer());
             game.fireReflexiveTriggeredAbility(ability, source);
             player.resetStoredBookmark(game);
             return true;