diff --git a/Mage.Sets/src/mage/cards/g/GoShintaiOfBoundlessVigor.java b/Mage.Sets/src/mage/cards/g/GoShintaiOfBoundlessVigor.java
new file mode 100644
index 0000000000..14884d5622
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/g/GoShintaiOfBoundlessVigor.java
@@ -0,0 +1,66 @@
+package mage.cards.g;
+
+import mage.MageInt;
+import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
+import mage.abilities.common.delayed.ReflexiveTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.common.DoWhenCostPaid;
+import mage.abilities.effects.common.counter.AddCountersTargetEffect;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledPermanent;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class GoShintaiOfBoundlessVigor extends CardImpl {
+
+    private static final FilterPermanent filter
+            = new FilterPermanent(SubType.SHRINE, "Shrine");
+    private static final DynamicValue xValue
+            = new PermanentsOnBattlefieldCount(new FilterControlledPermanent(SubType.SHRINE));
+
+    public GoShintaiOfBoundlessVigor(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{1}{G}");
+
+        this.addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.SHRINE);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+
+        // At the beginning of your end step, you may pay {1}. When you do, put a +1/+1 counter on target Shrine for each Shrine you control.
+        ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(
+                new AddCountersTargetEffect(
+                        CounterType.P1P1.createInstance(0), xValue
+                ), false
+        );
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoWhenCostPaid(
+                ability, new GenericManaCost(1), "Pay {1}?"
+        ), TargetController.YOU, false));
+    }
+
+    private GoShintaiOfBoundlessVigor(final GoShintaiOfBoundlessVigor card) {
+        super(card);
+    }
+
+    @Override
+    public GoShintaiOfBoundlessVigor copy() {
+        return new GoShintaiOfBoundlessVigor(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java b/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
index d2c8b737bb..4ac2365b45 100644
--- a/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
+++ b/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
@@ -68,6 +68,7 @@ public final class KamigawaNeonDynasty extends ExpansionSet {
         cards.add(new SetCardInfo("Geothermal Kami", 186, Rarity.COMMON, mage.cards.g.GeothermalKami.class));
         cards.add(new SetCardInfo("Gloomshrieker", 219, Rarity.UNCOMMON, mage.cards.g.Gloomshrieker.class));
         cards.add(new SetCardInfo("Go-Shintai of Ancient Wars", 144, Rarity.UNCOMMON, mage.cards.g.GoShintaiOfAncientWars.class));
+        cards.add(new SetCardInfo("Go-Shintai of Boundless Vigor", 187, Rarity.COMMON, mage.cards.g.GoShintaiOfBoundlessVigor.class));
         cards.add(new SetCardInfo("Go-Shintai of Shared Purpose", 14, Rarity.UNCOMMON, mage.cards.g.GoShintaiOfSharedPurpose.class));
         cards.add(new SetCardInfo("Goro-Goro, Disciple of Ryusei", 145, Rarity.RARE, mage.cards.g.GoroGoroDiscipleOfRyusei.class));
         cards.add(new SetCardInfo("Gravelighter", 98, Rarity.UNCOMMON, mage.cards.g.Gravelighter.class));