diff --git a/forge-gui/res/cardsfolder/upcoming/feywild_caretaker.txt b/forge-gui/res/cardsfolder/upcoming/feywild_caretaker.txt
index 81654345390..2c10d72e32e 100644
--- a/forge-gui/res/cardsfolder/upcoming/feywild_caretaker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/feywild_caretaker.txt
@@ -4,8 +4,7 @@ Types:Creature Orc Wizard
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInitiative | TriggerDescription$ When CARDNAME enters the battlefield, you take the initiative.
 SVar:TrigInitiative:DB$ TakeInitiative
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if you have the initiative, create a 1/1 blue Faerie Dragon creature token with flying.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckDefinedPlayer$ You.hasInitiative | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if you have the initiative, create a 1/1 blue Faerie Dragon creature token with flying.
 SVar:TrigToken:DB$ Token | TokenScript$ u_1_1_faerie_dragon_flying
-SVar:X:Count$Initiative.1.0
 DeckHas:Ability$Token & Type$Faerie|Dragon
 Oracle:When Feywild Caretaker enters the battlefield, you take the initiative.\nAt the beginning of your end step, if you have the initiative, create a 1/1 blue Faerie Dragon creature token with flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/imoen_mystic_trickster.txt b/forge-gui/res/cardsfolder/upcoming/imoen_mystic_trickster.txt
index 3b3fc0f8173..39346837310 100644
--- a/forge-gui/res/cardsfolder/upcoming/imoen_mystic_trickster.txt
+++ b/forge-gui/res/cardsfolder/upcoming/imoen_mystic_trickster.txt
@@ -3,10 +3,9 @@ ManaCost:2 U
 Types:Legendary Creature Human Rogue Wizard
 PT:2/3
 K:Ward:2
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if you have the initiative, draw a card. Draw another card if you've completed a dungeon.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckDefinedPlayer$ You.hasInitiative | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if you have the initiative, draw a card. Draw another card if you've completed a dungeon.
 SVar:TrigDraw:DB$ Draw | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ Y
+SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X
 K:Choose a Background
-SVar:X:Count$Initiative.1.0
-SVar:Y:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:PlayerCountPropertyYou$DungeonsCompleted
 Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nAt the beginning of your end step, if you have the initiative, draw a card. Draw another card if you've completed a dungeon.\nChoose a Background (You can have a Background as a second commander.)
diff --git a/forge-gui/res/cardsfolder/upcoming/safana_calimport.cutthroat.txt b/forge-gui/res/cardsfolder/upcoming/safana_calimport.cutthroat.txt
index 0ca50c5304d..ae7721b53eb 100644
--- a/forge-gui/res/cardsfolder/upcoming/safana_calimport.cutthroat.txt
+++ b/forge-gui/res/cardsfolder/upcoming/safana_calimport.cutthroat.txt
@@ -3,11 +3,10 @@ ManaCost:2 B
 Types:Legendary Creature Human Rogue
 PT:3/2
 K:Menace
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | Execute$ TrigTreasure | TriggerDescription$ At the beginning of your end step, if you have the initiative, create a Treasure token. If you've completed a dungeon, create three of those tokens instead.
-SVar:TrigTreasure:DB$ Token | TokenAmount$ Z | TokenScript$ c_a_treasure_sac
-SVar:X:Count$Initiative.1.0
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckDefinedPlayer$ You.hasInitiative | Execute$ TrigTreasure | TriggerDescription$ At the beginning of your end step, if you have the initiative, create a Treasure token. If you've completed a dungeon, create three of those tokens instead.
+SVar:TrigTreasure:DB$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac
+SVar:X:Count$Compare Y GE1.3.1
 SVar:Y:PlayerCountPropertyYou$DungeonsCompleted
-SVar:Z:Count$Compare Y GE1.3.1
 K:Choose a Background
 DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure
 AI:RemoveDeck:Random