diff --git a/forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt b/forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt
index 7f80d070c71..168f18dd25e 100644
--- a/forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt
+++ b/forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt
@@ -8,10 +8,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:DBDelayedTrigger:DB$ DelayedTrigger | Execute$ TrigAddAPI | Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerDescription$ When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
 SVar:TrigAddAPI:DB$ Effect | RememberObjects$ TriggeredCard | ForgetOnMoved$ Stack | ReplacementEffects$ ReplaceEnter
 SVar:ReplaceEnter:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ AddExtraCounter | ReplacementResult$ Updated | Description$ When you cast your next creature spell, that creature enters the battlefield with your choice of a +1/+1 counter, a flying counter, or a lifelink counter on it.
-SVar:AddExtraCounter:DB$ GenericChoice | Defined$ You | Choices$ P1P1,Flying,Lifelink
-SVar:P1P1:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard |CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ +1/+1 counter
-SVar:Flying:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ Flying | CounterNum$ 1 | SpellDescription$ Flying counter
-SVar:Lifelink:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard |CounterType$ Lifelink | CounterNum$ 1 | SpellDescription$ Lifelink counter
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1,Flying,Lifelink | CounterNum$ 1
 SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 DeckHas:Ability$LifeGain|Counters
 Oracle:Flying\nDouble team\nWhen Champions of Tyr enters the battlefield, you get a boon with "When you cast your next creature spell, that creature enters the battlefield with your choice of a +1/+1 counter, a flying counter, or a lifelink counter on it."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/genasi_rabble_rouser.txt b/forge-gui/res/cardsfolder/upcoming/genasi_rabble_rouser.txt
new file mode 100644
index 00000000000..c5de81318dc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/genasi_rabble_rouser.txt
@@ -0,0 +1,7 @@
+Name:Genasi Rabble-Rouser
+ManaCost:1 R
+Types:Creature Elemental Shaman
+K:Double Team
+A:AB$ PumpAll | Cost$ 1 R | ValidCards$ Creature.YouCtrl+namedGenasi Rabble-Rouser | NumAtt$ +1 | SpellDescription$ Creatures you control named Genasi Rabble-Rouser get +1/+0 until end of turn.
+DeckHas:Ability$Token
+Oracle:Double team\n{1}{R}: Creatures you control named Genasi Rabble-Rouser gets +1/+0 until end of turn.