diff --git a/forge-gui/res/cardsfolder/upcoming/captain_ngathrod.txt b/forge-gui/res/cardsfolder/upcoming/captain_nghathrod.txt
similarity index 87%
rename from forge-gui/res/cardsfolder/upcoming/captain_ngathrod.txt
rename to forge-gui/res/cardsfolder/upcoming/captain_nghathrod.txt
index 507f176c964..b823a317214 100644
--- a/forge-gui/res/cardsfolder/upcoming/captain_ngathrod.txt
+++ b/forge-gui/res/cardsfolder/upcoming/captain_nghathrod.txt
@@ -7,7 +7,8 @@ T:Mode$ DamageDone | ValidSource$ Card.Horror+YouCtrl | ValidTarget$ Player | Co
 SVar:TrigMill:DB$ Mill | Defined$ TriggeredTarget | NumCards$ X
 SVar:X:TriggerCount$DamageAmount
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ At the beginning of your end step, choose target artifact or creature card in an opponent's graveyard that was put there from their library this turn. Put it onto the battlefield under your control.
-SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Artifact.OppOwn+ThisTurnEnteredFrom_Library,Creature.OppOwn+ThisTurnEnteredFrom_Library | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
+SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Artifact.OppOwn+ThisTurnEnteredFrom_Library,Creature.OppOwn+ThisTurnEnteredFrom_Library | TgtPrompt$ Choose target artifact or creature card in an opponent's graveyard that was put there from their library this turn | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
 SVar:PlayMain1:TRUE
 DeckHints:Type$Horror
+DeckHas:Ability$Mill
 Oracle:Horrors you control have menace.\nWhenever a Horror you control deals combat damage to a player, that player mills that many cards.\nAt the beginning of your end step, choose target artifact or creature card in an opponent's graveyard that was put there from their library this turn. Put it onto the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/upcoming/tasha_the_witch_queen.txt b/forge-gui/res/cardsfolder/upcoming/tasha_the_witch_queen.txt
index 096c5540913..e7e9d366854 100644
--- a/forge-gui/res/cardsfolder/upcoming/tasha_the_witch_queen.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tasha_the_witch_queen.txt
@@ -2,12 +2,13 @@ Name:Tasha, the Witch Queen
 ManaCost:3 U B
 Types:Legendary Planeswalker Tasha
 Loyalty:4
+Text:CARDNAME can be your commander.
 T:Mode$ SpellCast | ValidCard$ Card.OppOwn | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell you don't own, create a 3/3 black Demon creature token.
 SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ b_3_3_demon
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | NumCards$ 1 | SubAbility$ DBExileForEach | SpellDescription$ Draw a card. For each opponent, exile up to one target instant or sorcery card from that player's graveyard and put a page counter on it.
-SVar:DBExileForEach:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Instant.OppCtrl,Sorcery.OppCtrl | TgtPrompt$ Choose up to one target instant or sorcery card in each opponent's graveyard | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True | SubAbility$ DBCounter | RememberChanged$ True
-SVar:DBCounter:DB$ PutCounter | CounterType$ PAGE | CounterNum$ 1 | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBExileForEach:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Instant.OppCtrl,Sorcery.OppCtrl | TgtPrompt$ Choose up to one target instant or sorcery card in each opponent's graveyard | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True | WithCountersType$ PAGE
 SVar:OneEach:PlayerCountOpponents$Amount
-A:AB$ Play | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Ultimate$ True | Valid$ Card.counters_GE1_PAGE | ValidZone$ Exile | WithoutManaCost$ True | ValidSA$ Spell | Amount$ 1 | Controller$ You | Optional$ True | SpellDescription$ You may cast a spell from among cards in exile with page counters on them without paying its mana cost.
+A:AB$ Play | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Ultimate$ True | AICheckSVar$ CheckExile | AISVarCompare$ GE1 | Valid$ Card.counters_GE1_PAGE | ValidZone$ Exile | WithoutManaCost$ True | ValidSA$ Spell | Amount$ 1 | Controller$ You | Optional$ True | SpellDescription$ You may cast a spell from among cards in exile with page counters on them without paying its mana cost.
+SVar:CheckExile:Count$ValidExile Card.counters_GE1_PAGE
+DeckHas:Ability$Token & Type$Demon
 Oracle:Whenever you cast a spell you don't own, create a 3/3 black Demon creature token.\n[+1]: Draw a card. For each opponent, exile up to one target instant or sorcery card from that player's graveyard and put a page counter on it.\n[-3]: You may cast a spell from among cards in exile with page counters on them without paying its mana cost.\nTasha, the Witch Queen can be your commander.