diff --git a/forge-gui/res/cardsfolder/a/aleatory.txt b/forge-gui/res/cardsfolder/a/aleatory.txt
index bfcddf25508..d52dca7862f 100644
--- a/forge-gui/res/cardsfolder/a/aleatory.txt
+++ b/forge-gui/res/cardsfolder/a/aleatory.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:Cast CARDNAME only during combat after blockers are declared.
 A:SP$ FlipACoin | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature to gain +1/+1 | WinSubAbility$ AleatoryPump | LoseSubAbility$ DelTrigSlowtrip | ActivationPhases$ Declare Blockers->EndCombat | SpellDescription$ Flip a coin. If you win the flip, target creature gets +1/+1 until end of turn. Draw a card at the beginning of the next turn's upkeep.
 SVar:AleatoryPump:DB$ Pump | Defined$ Targeted | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | Defined$ You
 AI:RemoveDeck:All
 Oracle:Cast this spell only during combat after blockers are declared.\nFlip a coin. If you win the flip, target creature gets +1/+1 until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/a/arcane_denial.txt b/forge-gui/res/cardsfolder/a/arcane_denial.txt
index 378521ce6a8..8f5e16f8fff 100644
--- a/forge-gui/res/cardsfolder/a/arcane_denial.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_denial.txt
@@ -2,9 +2,9 @@ Name:Arcane Denial
 ManaCost:1 U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | RememberCountered$ True | ValidTgts$ Card | SubAbility$ DelTrigSlowtrip | SpellDescription$ Counter target spell. Its controller may draw up to two cards at the beginning of the next turn's upkeep. You draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | SubAbility$ DelTrigDrawTwo | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | SubAbility$ DelTrigDrawTwo | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | Defined$ You
-SVar:DelTrigDrawTwo:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | RememberObjects$ RememberedController | Execute$ DrawTwo | TriggerDescription$ Draw up to two cards. | SubAbility$ DBCleanup
+SVar:DelTrigDrawTwo:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | RememberObjects$ RememberedController | Execute$ DrawTwo | TriggerDescription$ Draw up to two cards. | SubAbility$ DBCleanup
 SVar:DrawTwo:DB$ Draw | NumCards$ 2 | Defined$ DelayTriggerRemembered | Upto$ True | AILogic$ OptionalDraw
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Counter target spell. Its controller may draw up to two cards at the beginning of the next turn's upkeep.\nYou draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/a/astrolabe.txt b/forge-gui/res/cardsfolder/a/astrolabe.txt
index 4c82bb30acf..813fbf57a55 100644
--- a/forge-gui/res/cardsfolder/a/astrolabe.txt
+++ b/forge-gui/res/cardsfolder/a/astrolabe.txt
@@ -2,7 +2,7 @@ Name:Astrolabe
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | Amount$ 2 | SubAbility$ DelTrigSlowtrip | SpellDescription$ Add two mana of any one color. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card at the beginning of the next turn's upkeep.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card at the beginning of the next turn's upkeep.
 SVar:DrawSlowtrip:DB$ Draw | Defined$ You
 AI:RemoveDeck:All
 Oracle:{1}, {T}, Sacrifice Astrolabe: Add two mana of any one color. Draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/b/balduvian_rage.txt b/forge-gui/res/cardsfolder/b/balduvian_rage.txt
index 44daecdb132..67aef7848bb 100644
--- a/forge-gui/res/cardsfolder/b/balduvian_rage.txt
+++ b/forge-gui/res/cardsfolder/b/balduvian_rage.txt
@@ -2,7 +2,7 @@ Name:Balduvian Rage
 ManaCost:X R
 Types:Instant
 A:SP$ Pump | Cost$ X R | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ X | SpellDescription$ Target attacking creature gets +X/+0 until end of turn. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:X:Count$xPaid
 Oracle:Target attacking creature gets +X/+0 until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/b/barbed_sextant.txt b/forge-gui/res/cardsfolder/b/barbed_sextant.txt
index 171c38412df..0eebb61638b 100644
--- a/forge-gui/res/cardsfolder/b/barbed_sextant.txt
+++ b/forge-gui/res/cardsfolder/b/barbed_sextant.txt
@@ -2,7 +2,7 @@ Name:Barbed Sextant
 ManaCost:1
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | SubAbility$ DelTrigSlowtrip | SpellDescription$ Add one mana of any color. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:{1}, {T}, Sacrifice Barbed Sextant: Add one mana of any color. Draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/b/bestial_fury.txt b/forge-gui/res/cardsfolder/b/bestial_fury.txt
index e0f7451c4e2..f116658abc3 100644
--- a/forge-gui/res/cardsfolder/b/bestial_fury.txt
+++ b/forge-gui/res/cardsfolder/b/bestial_fury.txt
@@ -5,7 +5,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
 T:Mode$ AttackerBlocked | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever enchanted creature becomes blocked, it gets +4/+0 and gains trample until end of turn.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttacker | NumAtt$ +4 | KW$ Trample
 Oracle:Enchant creature\nWhen Bestial Fury enters the battlefield, draw a card at the beginning of the next turn's upkeep.\nWhenever enchanted creature becomes blocked, it gets +4/+0 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/b/bone_harvest.txt b/forge-gui/res/cardsfolder/b/bone_harvest.txt
index 8d0ac9dd985..5ca8448900f 100644
--- a/forge-gui/res/cardsfolder/b/bone_harvest.txt
+++ b/forge-gui/res/cardsfolder/b/bone_harvest.txt
@@ -2,7 +2,7 @@ Name:Bone Harvest
 ManaCost:2 B
 Types:Instant
 A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Library | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Put any number of target creature cards from your graveyard on top of your library. Draw a card at the beginning of next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:X:Count$TypeInYourYard.Creature
 Oracle:Put any number of target creature cards from your graveyard on top of your library.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/b/burnout.txt b/forge-gui/res/cardsfolder/b/burnout.txt
index 8d565f9755f..4b09d99f1de 100644
--- a/forge-gui/res/cardsfolder/b/burnout.txt
+++ b/forge-gui/res/cardsfolder/b/burnout.txt
@@ -2,7 +2,7 @@ Name:Burnout
 ManaCost:1 R
 Types:Instant
 A:SP$ Counter | Cost$ 1 R | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Instant | AITgts$ Card.Blue | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SpellDescription$ Counter target instant spell if it's blue. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:X:Targeted$Valid Card.Blue
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/c/carrier_pigeons.txt b/forge-gui/res/cardsfolder/c/carrier_pigeons.txt
index 90fea914034..a406aec1fae 100644
--- a/forge-gui/res/cardsfolder/c/carrier_pigeons.txt
+++ b/forge-gui/res/cardsfolder/c/carrier_pigeons.txt
@@ -4,6 +4,6 @@ Types:Creature Bird
 PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Flying\nWhen Carrier Pigeons enters the battlefield, draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/c/clairvoyance.txt b/forge-gui/res/cardsfolder/c/clairvoyance.txt
index bc3d6365ad4..f222ead2ac7 100644
--- a/forge-gui/res/cardsfolder/c/clairvoyance.txt
+++ b/forge-gui/res/cardsfolder/c/clairvoyance.txt
@@ -2,7 +2,7 @@ Name:Clairvoyance
 ManaCost:U
 Types:Instant
 A:SP$ RevealHand | Cost$ U | ValidTgts$ Player | TgtPrompt$ Select target player | Look$ True | SubAbility$ DelTrigSlowtrip | SpellDescription$ Look at target player's hand. Draw a card at the beginning of next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Look at target player's hand.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/d/dazzling_beauty.txt b/forge-gui/res/cardsfolder/d/dazzling_beauty.txt
index a15329f040d..e25db058b50 100644
--- a/forge-gui/res/cardsfolder/d/dazzling_beauty.txt
+++ b/forge-gui/res/cardsfolder/d/dazzling_beauty.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Instant
 Text:Cast this spell only during the declare blockers step.
 A:SP$ BecomesBlocked | Cost$ 2 W | ValidTgts$ Creature.attacking+unblocked | TgtPrompt$ Select target unblocked attacking creature | SubAbility$ DelTrigSlowtrip | ActivationPhases$ Declare Blockers | SpellDescription$ Target unblocked attacking creature becomes blocked. (This spell works on creatures that can't be blocked.) Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Cast this spell only during the declare blockers step.\nTarget unblocked attacking creature becomes blocked. (This spell works on creatures that can't be blocked.)\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/e/enervate.txt b/forge-gui/res/cardsfolder/e/enervate.txt
index e388b7c7ffb..8abc58d818f 100644
--- a/forge-gui/res/cardsfolder/e/enervate.txt
+++ b/forge-gui/res/cardsfolder/e/enervate.txt
@@ -2,7 +2,7 @@ Name:Enervate
 ManaCost:1 U
 Types:Instant
 A:SP$ Tap | Cost$ 1 U | TgtPrompt$ Choose target artifact, creature or land | ValidTgts$ Artifact,Creature,Land | SpellDescription$ Tap target artifact, creature or land. Draw a card at the beginning of next turn's upkeep | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Tap target artifact, creature, or land.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/f/feral_instinct.txt b/forge-gui/res/cardsfolder/f/feral_instinct.txt
index 01e08542594..42ef26b63c7 100644
--- a/forge-gui/res/cardsfolder/f/feral_instinct.txt
+++ b/forge-gui/res/cardsfolder/f/feral_instinct.txt
@@ -2,6 +2,6 @@ Name:Feral Instinct
 ManaCost:1 G
 Types:Instant
 A:SP$ Pump | Cost$ 1 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target creature gets +1/+1 until end of turn. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Target creature gets +1/+1 until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/f/fevered_strength.txt b/forge-gui/res/cardsfolder/f/fevered_strength.txt
index 09a7a91afa0..57ef902eaa0 100644
--- a/forge-gui/res/cardsfolder/f/fevered_strength.txt
+++ b/forge-gui/res/cardsfolder/f/fevered_strength.txt
@@ -2,6 +2,6 @@ Name:Fevered Strength
 ManaCost:2 B
 Types:Instant
 A:SP$ Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | SpellDescription$ Target creature gets +2/+0 until end of turn. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Target creature gets +2/+0 until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/f/flare.txt b/forge-gui/res/cardsfolder/f/flare.txt
index 69f4741bdc6..436eceb95b7 100644
--- a/forge-gui/res/cardsfolder/f/flare.txt
+++ b/forge-gui/res/cardsfolder/f/flare.txt
@@ -2,6 +2,6 @@ Name:Flare
 ManaCost:2 R
 Types:Instant
 A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ Flare deals 1 damage to any target. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Flare deals 1 damage to any target.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/f/force_void.txt b/forge-gui/res/cardsfolder/f/force_void.txt
index aa316731dc1..2fafe1a79f7 100644
--- a/forge-gui/res/cardsfolder/f/force_void.txt
+++ b/forge-gui/res/cardsfolder/f/force_void.txt
@@ -2,6 +2,6 @@ Name:Force Void
 ManaCost:2 U
 Types:Instant
 A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays {1}. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Counter target spell unless its controller pays {1}.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/f/foreshadow.txt b/forge-gui/res/cardsfolder/f/foreshadow.txt
index 92d5f45a03a..a2b29361a3b 100644
--- a/forge-gui/res/cardsfolder/f/foreshadow.txt
+++ b/forge-gui/res/cardsfolder/f/foreshadow.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ NameCard | Cost$ 1 U | Defined$ You | SubAbility$ DBMill | SpellDescription$ Choose a card name, then target opponent puts the top card of their library into their graveyard. If a card with the chosen name was milled this way, you draw a card. Draw a card at the beginning of the next turn's upkeep.
 SVar:DBMill:DB$ Mill | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumCards$ 1 | RememberMilled$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:X:Remembered$Valid Card.NamedCard
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/f/foresight.txt b/forge-gui/res/cardsfolder/f/foresight.txt
index bb8ca073bd5..39a6c152873 100644
--- a/forge-gui/res/cardsfolder/f/foresight.txt
+++ b/forge-gui/res/cardsfolder/f/foresight.txt
@@ -2,7 +2,7 @@ Name:Foresight
 ManaCost:1 U
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | Mandatory$ True | SpellDescription$ Search your library for three cards, exile them, then shuffle. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/f/formation.txt b/forge-gui/res/cardsfolder/f/formation.txt
index 9a01b9a7cd0..7d7ca45b7bc 100644
--- a/forge-gui/res/cardsfolder/f/formation.txt
+++ b/forge-gui/res/cardsfolder/f/formation.txt
@@ -2,7 +2,7 @@ Name:Formation
 ManaCost:1 W
 Types:Instant
 A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Banding | SubAbility$ DelTrigSlowtrip | SpellDescription$ Target creature gains banding until end of turn. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Target creature gains banding until end of turn. (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding a player controls are blocking or being blocked by a creature, that player divides that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/f/foxfire.txt b/forge-gui/res/cardsfolder/f/foxfire.txt
index 4576d72f19c..84dae7bf4e5 100644
--- a/forge-gui/res/cardsfolder/f/foxfire.txt
+++ b/forge-gui/res/cardsfolder/f/foxfire.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Instant
 A:SP$ Untap | Cost$ 2 G | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | SubAbility$ DBPump | SpellDescription$ Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn. Draw a card at the beginning of the next turn's upkeep.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Prevent all combat damage that would be dealt to and dealt by CARDNAME. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/g/gorilla_war_cry.txt b/forge-gui/res/cardsfolder/g/gorilla_war_cry.txt
index c04021ac167..fea45a80e3c 100644
--- a/forge-gui/res/cardsfolder/g/gorilla_war_cry.txt
+++ b/forge-gui/res/cardsfolder/g/gorilla_war_cry.txt
@@ -2,6 +2,6 @@ Name:Gorilla War Cry
 ManaCost:1 R
 Types:Instant
 A:SP$ PumpAll | Cost$ 1 R | ValidCards$ Creature | KW$ Menace | ActivationPhases$ BeginCombat->Declare Attackers | SubAbility$ DelTrigSlowtrip | SpellDescription$ All creatures gain menace until end of turn.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Cast this spell only during combat before blockers are declared.\nAll creatures gain menace until end of turn. (They can't be blocked except by two or more creatures.)\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/g/gravebind.txt b/forge-gui/res/cardsfolder/g/gravebind.txt
index 1298b4387be..976548047ae 100644
--- a/forge-gui/res/cardsfolder/g/gravebind.txt
+++ b/forge-gui/res/cardsfolder/g/gravebind.txt
@@ -2,7 +2,7 @@ Name:Gravebind
 ManaCost:B
 Types:Instant
 A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't be regenerated. | IsCurse$ True | SubAbility$ DelTrigSlowtrip | SpellDescription$ Target creature can't be regenerated this turn. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/h/headstone.txt b/forge-gui/res/cardsfolder/h/headstone.txt
index c6930ede765..725c3fa1b7c 100644
--- a/forge-gui/res/cardsfolder/h/headstone.txt
+++ b/forge-gui/res/cardsfolder/h/headstone.txt
@@ -2,6 +2,6 @@ Name:Headstone
 ManaCost:1 B
 Types:Instant
 A:SP$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Exile target card from a graveyard.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/h/heal.txt b/forge-gui/res/cardsfolder/h/heal.txt
index 4f9786551e3..e5746743816 100644
--- a/forge-gui/res/cardsfolder/h/heal.txt
+++ b/forge-gui/res/cardsfolder/h/heal.txt
@@ -2,6 +2,6 @@ Name:Heal
 ManaCost:W
 Types:Instant
 A:SP$ PreventDamage | Cost$ W | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | Amount$ 1 | SubAbility$ DelTrigSlowtrip | SpellDescription$ Prevent the next 1 damage that would be dealt to any target this turn. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Prevent the next 1 damage that would be dealt to any target this turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/i/infuse.txt b/forge-gui/res/cardsfolder/i/infuse.txt
index b350e2b43b5..db4ce29a71d 100644
--- a/forge-gui/res/cardsfolder/i/infuse.txt
+++ b/forge-gui/res/cardsfolder/i/infuse.txt
@@ -2,6 +2,6 @@ Name:Infuse
 ManaCost:2 U
 Types:Instant
 A:SP$ Untap | Cost$ 2 U | TgtPrompt$ Choose target artifact, creature or land | ValidTgts$ Artifact,Creature,Land | SpellDescription$ Untap target artifact, creature or land. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Untap target artifact, creature, or land.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/j/jinx.txt b/forge-gui/res/cardsfolder/j/jinx.txt
index 9a11ded37ae..b5677895585 100644
--- a/forge-gui/res/cardsfolder/j/jinx.txt
+++ b/forge-gui/res/cardsfolder/j/jinx.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Instant
 A:SP$ ChooseType | Cost$ 1 U | Defined$ You | Type$ Basic Land | SubAbility$ DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. Draw a card at the beginning of the next turn's upkeep.
 SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | RemoveLandTypes$ True | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Target land becomes the basic land type of your choice until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/j/jolt.txt b/forge-gui/res/cardsfolder/j/jolt.txt
index 0d291e1209f..3de34b0d3b4 100644
--- a/forge-gui/res/cardsfolder/j/jolt.txt
+++ b/forge-gui/res/cardsfolder/j/jolt.txt
@@ -2,7 +2,7 @@ Name:Jolt
 ManaCost:2 U
 Types:Instant
 A:SP$ TapOrUntap | Cost$ 2 U | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SubAbility$ DelTrigSlowtrip | SpellDescription$ You may tap or untap target artifact, creature, or land. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:You may tap or untap target artifact, creature, or land.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/k/krovikan_fetish.txt b/forge-gui/res/cardsfolder/k/krovikan_fetish.txt
index 578e389b973..365f9068103 100644
--- a/forge-gui/res/cardsfolder/k/krovikan_fetish.txt
+++ b/forge-gui/res/cardsfolder/k/krovikan_fetish.txt
@@ -5,6 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Enchant creature\nWhen Krovikan Fetish enters the battlefield, draw a card at the beginning of the next turn's upkeep.\nEnchanted creature gets +1/+1.
diff --git a/forge-gui/res/cardsfolder/k/krovikan_plague.txt b/forge-gui/res/cardsfolder/k/krovikan_plague.txt
index b1a44da40fc..2e1f63d989b 100644
--- a/forge-gui/res/cardsfolder/k/krovikan_plague.txt
+++ b/forge-gui/res/cardsfolder/k/krovikan_plague.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant non-Wall creature you control
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature.nonWall+YouCtrl | TgtPrompt$ Select target non-Wall creature you control | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 A:AB$ DealDamage | Cost$ tapXType<1/Creature.EnchantedBy/Enchanted Creature> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SubAbility$ DBPutCounter | CostDesc$ Tap enchanted creature: | SpellDescription$ CARDNAME deals 1 damage to any target. Put a -0/-1 counter on enchanted creature. Activate only if enchanted creature is untapped.
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Enchanted | CounterType$ M0M1 | CounterNum$ 1
diff --git a/forge-gui/res/cardsfolder/l/lat_nams_legacy.txt b/forge-gui/res/cardsfolder/l/lat_nams_legacy.txt
index 79ee8ce1f96..67371be6373 100644
--- a/forge-gui/res/cardsfolder/l/lat_nams_legacy.txt
+++ b/forge-gui/res/cardsfolder/l/lat_nams_legacy.txt
@@ -2,6 +2,6 @@ Name:Lat-Nam's Legacy
 ManaCost:1 U
 Types:Instant
 A:SP$ ChangeZone | Cost$ 1 U | Origin$ Hand | Destination$ Library | Shuffle$ True | ChangeType$ Card | RememberChanged$ True | SubAbility$ DelTrigSlowtrip | SpellDescription$ Shuffle a card from your hand into your library. If you do, draw two cards at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw two cards.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw two cards.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 2 | Defined$ You
 Oracle:Shuffle a card from your hand into your library. If you do, draw two cards at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/l/library_of_lat_nam.txt b/forge-gui/res/cardsfolder/l/library_of_lat_nam.txt
index 6cb3ea32074..7d72729cfdb 100644
--- a/forge-gui/res/cardsfolder/l/library_of_lat_nam.txt
+++ b/forge-gui/res/cardsfolder/l/library_of_lat_nam.txt
@@ -1,8 +1,8 @@
-Name:Library of Lat-Nam
+Name:Library of Lat-Nam
 ManaCost:4 U
 Types:Sorcery
 A:SP$ Charm | Cost$ 4 U | Chooser$ Opponent | Choices$ DelTrigSlowDraw,Tutor
-SVar:DelTrigSlowDraw:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowThree | SpellDescription$ You draw three cards at the beginning of the next turn's upkeep.
+SVar:DelTrigSlowDraw:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowThree | SpellDescription$ You draw three cards at the beginning of the next turn's upkeep.
 SVar:DrawSlowThree:DB$ Draw | NumCards$ 3 | Defined$ You
 SVar:Tutor:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SpellDescription$ You search your library for a card, put that card into your hand, then shuffle.
 Oracle:An opponent chooses one —\n• You draw three cards at the beginning of the next turn's upkeep.\n• You search your library for a card, put that card into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/l/lightning_blow.txt b/forge-gui/res/cardsfolder/l/lightning_blow.txt
index 12c01933f8b..e6118237524 100644
--- a/forge-gui/res/cardsfolder/l/lightning_blow.txt
+++ b/forge-gui/res/cardsfolder/l/lightning_blow.txt
@@ -2,6 +2,6 @@ Name:Lightning Blow
 ManaCost:1 W
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Target creature gains first strike until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/l/lodestone_bauble.txt b/forge-gui/res/cardsfolder/l/lodestone_bauble.txt
index 2908aaca3ba..b10a045ecd0 100644
--- a/forge-gui/res/cardsfolder/l/lodestone_bauble.txt
+++ b/forge-gui/res/cardsfolder/l/lodestone_bauble.txt
@@ -2,7 +2,7 @@ Name:Lodestone Bauble
 ManaCost:0
 Types:Artifact
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 4 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | TgtPrompt$ Choose target basic land card in a graveyard | ValidTgts$ Land.Basic | Chooser$ You | SubAbility$ DelTrigSlowtrip | SpellDescription$ Put up to four target basic land cards from a player's graveyard on top of their library in any order. That player draws a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:Random
 Oracle:{1}, {T}, Sacrifice Lodestone Bauble: Put up to four target basic land cards from a player's graveyard on top of their library in any order. That player draws a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/m/mind_ravel.txt b/forge-gui/res/cardsfolder/m/mind_ravel.txt
index 0c5a225cf8e..025eb43b871 100644
--- a/forge-gui/res/cardsfolder/m/mind_ravel.txt
+++ b/forge-gui/res/cardsfolder/m/mind_ravel.txt
@@ -2,6 +2,6 @@ Name:Mind Ravel
 ManaCost:2 B
 Types:Sorcery
 A:SP$ Discard | Cost$ 2 B | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DelTrigSlowtrip | SpellDescription$ Target player discards a card. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Target player discards a card.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/m/mishras_bauble.txt b/forge-gui/res/cardsfolder/m/mishras_bauble.txt
index b6f6d139d2d..6149db584b8 100644
--- a/forge-gui/res/cardsfolder/m/mishras_bauble.txt
+++ b/forge-gui/res/cardsfolder/m/mishras_bauble.txt
@@ -2,7 +2,7 @@ Name:Mishra's Bauble
 ManaCost:0
 Types:Artifact
 A:AB$ Dig | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | DigNum$ 1 | NoMove$ True | SubAbility$ DelTrigSlowtrip | SpellDescription$ Look at the top card of target player's library.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | StackDescription$ SpellDescription | SpellDescription$ Draw a card at the beginning of the next turn's upkeep.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | StackDescription$ SpellDescription | SpellDescription$ Draw a card at the beginning of the next turn's upkeep.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:{T}, Sacrifice Mishra's Bauble: Look at the top card of target player's library. Draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/m/mystic_melting.txt b/forge-gui/res/cardsfolder/m/mystic_melting.txt
index df5d5d3e07a..1d737b47e7e 100644
--- a/forge-gui/res/cardsfolder/m/mystic_melting.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_melting.txt
@@ -2,6 +2,6 @@ Name:Mystic Melting
 ManaCost:3 G
 Types:Instant
 A:SP$ Destroy | Cost$ 3 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Destroy target artifact or enchantment.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/p/panic.txt b/forge-gui/res/cardsfolder/p/panic.txt
index 56d10a3d7ad..0e47d45323c 100644
--- a/forge-gui/res/cardsfolder/p/panic.txt
+++ b/forge-gui/res/cardsfolder/p/panic.txt
@@ -3,6 +3,6 @@ ManaCost:R
 Types:Instant
 Text:Cast this spell only during combat before blockers are declared.
 A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | ActivationPhases$ BeginCombat->Declare Attackers | IsCurse$ True | SpellDescription$ Target creature can't block this turn. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Cast this spell only during combat before blockers are declared.\nTarget creature can't block this turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/p/portent.txt b/forge-gui/res/cardsfolder/p/portent.txt
index f4ea3e77259..4deb974e8a9 100644
--- a/forge-gui/res/cardsfolder/p/portent.txt
+++ b/forge-gui/res/cardsfolder/p/portent.txt
@@ -2,6 +2,6 @@ Name:Portent
 ManaCost:U
 Types:Sorcery
 A:SP$ RearrangeTopOfLibrary | Cost$ U | ValidTgts$ Player | TgtPrompt$ Choose target player. | NumCards$ 3 | MayShuffle$ True | SubAbility$ DelTrigSlowtrip | SpellDescription$ Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/p/prophecy.txt b/forge-gui/res/cardsfolder/p/prophecy.txt
index d39620cb62e..b134da865a5 100644
--- a/forge-gui/res/cardsfolder/p/prophecy.txt
+++ b/forge-gui/res/cardsfolder/p/prophecy.txt
@@ -4,6 +4,6 @@ Types:Sorcery
 A:SP$ Dig | Cost$ W | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | DigNum$ 1 | Reveal$ True | DestinationZone$ Library | LibraryPosition$ 0 | LibraryPosition2$ 0 | NoMove$ True | RememberRevealed$ True | SubAbility$ DBGainLife | SpellDescription$ Reveal the top card of target opponent's library. If it's a land, you gain 1 life. Then that player shuffles. Draw a card at the beginning of the next turn's upkeep.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card.Land | ConditionCompare$ GE1 | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ Shuffle | Defined$ ParentTarget | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Reveal the top card of target opponent's library. If it's a land, you gain 1 life. Then that player shuffles.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/p/pyknite.txt b/forge-gui/res/cardsfolder/p/pyknite.txt
index ff606951bcf..1be7c066ca3 100644
--- a/forge-gui/res/cardsfolder/p/pyknite.txt
+++ b/forge-gui/res/cardsfolder/p/pyknite.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Ouphe
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:When Pyknite enters the battlefield, draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/r/ray_of_erasure.txt b/forge-gui/res/cardsfolder/r/ray_of_erasure.txt
index bc7469b2245..03ebc8344f0 100644
--- a/forge-gui/res/cardsfolder/r/ray_of_erasure.txt
+++ b/forge-gui/res/cardsfolder/r/ray_of_erasure.txt
@@ -2,6 +2,6 @@ Name:Ray of Erasure
 ManaCost:U
 Types:Instant
 A:SP$ Mill | Cost$ U | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player mills a card. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Target player mills a card.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/r/renewal.txt b/forge-gui/res/cardsfolder/r/renewal.txt
index ddc12e21264..c55b51f71e7 100644
--- a/forge-gui/res/cardsfolder/r/renewal.txt
+++ b/forge-gui/res/cardsfolder/r/renewal.txt
@@ -2,6 +2,6 @@ Name:Renewal
 ManaCost:2 G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 2 G Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield, then shuffle. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:As an additional cost to cast this spell, sacrifice a land.\nSearch your library for a basic land card, put that card onto the battlefield, then shuffle.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/r/ritual_of_steel.txt b/forge-gui/res/cardsfolder/r/ritual_of_steel.txt
index 76803a4bcc1..c48b688197d 100644
--- a/forge-gui/res/cardsfolder/r/ritual_of_steel.txt
+++ b/forge-gui/res/cardsfolder/r/ritual_of_steel.txt
@@ -5,6 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 2 | Description$ Enchanted creature gets +0/+2.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Enchant creature\nWhen Ritual of Steel enters the battlefield, draw a card at the beginning of the next turn's upkeep.\nEnchanted creature gets +0/+2.
diff --git a/forge-gui/res/cardsfolder/s/sapphire_charm.txt b/forge-gui/res/cardsfolder/s/sapphire_charm.txt
index 3a023510467..1f9b4246dc3 100644
--- a/forge-gui/res/cardsfolder/s/sapphire_charm.txt
+++ b/forge-gui/res/cardsfolder/s/sapphire_charm.txt
@@ -1,8 +1,8 @@
-Name:Sapphire Charm
+Name:Sapphire Charm
 ManaCost:U
 Types:Instant
 A:SP$ Charm | Cost$ U | Choices$ DelTrigSlowtrip,Pump,Phases | CharmNum$ 1
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidTgts$ Player | RememberObjects$ Targeted | TgtPrompt$ Select target player | Execute$ DrawSlowtrip | SpellDescription$ Target player draws a card at the beginning of the next turn's upkeep.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidTgts$ Player | RememberObjects$ Targeted | TgtPrompt$ Select target player | Execute$ DrawSlowtrip | SpellDescription$ Target player draws a card at the beginning of the next turn's upkeep.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ DelayTriggerRemembered | SpellDescription$ Draw a card.
 SVar:Pump:DB$ Pump | ValidTgts$ Creature | KW$ Flying | TgtPrompt$ Select target creature | SpellDescription$ Target creature gains flying until end of turn.
 SVar:Phases:DB$ Phases | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SpellDescription$ Target creature an opponent controls phases out.
diff --git a/forge-gui/res/cardsfolder/s/scarab_of_the_unseen.txt b/forge-gui/res/cardsfolder/s/scarab_of_the_unseen.txt
index ee898600365..456277c509b 100644
--- a/forge-gui/res/cardsfolder/s/scarab_of_the_unseen.txt
+++ b/forge-gui/res/cardsfolder/s/scarab_of_the_unseen.txt
@@ -2,7 +2,7 @@ Name:Scarab of the Unseen
 ManaCost:2
 Types:Artifact
 A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.YouOwn | TgtPrompt$ Select target permanent you own | ChangeType$ Aura.AttachedTo Targeted | SubAbility$ DelTrigSlowtrip | SpellDescription$ Return all Auras attached to target permanent you own to their owners' hands. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:Random
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/s/solfatara.txt b/forge-gui/res/cardsfolder/s/solfatara.txt
index b2f292a2c0d..646f4a52a8e 100644
--- a/forge-gui/res/cardsfolder/s/solfatara.txt
+++ b/forge-gui/res/cardsfolder/s/solfatara.txt
@@ -3,6 +3,6 @@ ManaCost:2 R
 Types:Instant
 A:SP$ Effect | Cost$ 2 R | ValidTgts$ Player | Name$ Solfatara Effect | StaticAbilities$ STCantPlayLand | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SubAbility$ DelTrigSlowtrip | SpellDescription$ Target player can't play lands this turn. Draw a card at the beginning of the next turn's upkeep.
 SVar:STCantPlayLand:Mode$ CantPlayLand | EffectZone$ Command | Player$ Player.IsRemembered | Description$ Target player can't play lands this turn.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Target player can't play lands this turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/s/soul_rend.txt b/forge-gui/res/cardsfolder/s/soul_rend.txt
index 317673121d8..bea5c8fa937 100644
--- a/forge-gui/res/cardsfolder/s/soul_rend.txt
+++ b/forge-gui/res/cardsfolder/s/soul_rend.txt
@@ -2,7 +2,7 @@ Name:Soul Rend
 ManaCost:1 B
 Types:Instant
 A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature | AITgts$ Card.White | TgtPrompt$ Select target creature | ConditionDefined$ Targeted | ConditionPresent$ Creature.White | ConditionCompare$ EQ1 | NoRegen$ True | SubAbility$ DelTrigSlowtrip | SpellDescription$ Destroy target creature if it's white. A creature destroyed this way can't be regenerated. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:Random
 Oracle:Destroy target creature if it's white. A creature destroyed this way can't be regenerated.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/s/suffocation.txt b/forge-gui/res/cardsfolder/s/suffocation.txt
index 4e7ce649ad5..bb79fd9deb2 100644
--- a/forge-gui/res/cardsfolder/s/suffocation.txt
+++ b/forge-gui/res/cardsfolder/s/suffocation.txt
@@ -8,7 +8,7 @@ SVar:TrigRemember:DB$ Pump | RememberObjects$ TriggeredSourceController
 T:Mode$ Phase | Phase$ Cleanup | Execute$ TrigReset | Static$ True
 SVar:TrigReset:DB$ Cleanup | ClearRemembered$ True
 A:SP$ DealDamage | Cost$ 1 U | Defined$ Remembered | NumDmg$ 4 | CheckSVar$ X | SVarCompare$ EQ1 | SubAbility$ DelTrigSlowtrip | SpellDescription$ CARDNAME deals 4 damage to the controller of the last red instant or sorcery spell that dealt damage to you this turn. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:X:Count$RememberedSize
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/s/swift_maneuver.txt b/forge-gui/res/cardsfolder/s/swift_maneuver.txt
index 831b5b29eef..05242722c5b 100644
--- a/forge-gui/res/cardsfolder/s/swift_maneuver.txt
+++ b/forge-gui/res/cardsfolder/s/swift_maneuver.txt
@@ -2,6 +2,6 @@ Name:Swift Maneuver
 ManaCost:1 W
 Types:Instant
 A:SP$ PreventDamage | Cost$ 1 W | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | Amount$ 2 | SubAbility$ DelTrigSlowtrip | SpellDescription$ Prevent the next 2 damage that would be dealt to any target this turn. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Prevent the next 2 damage that would be dealt to any target this turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/t/telimtors_edict.txt b/forge-gui/res/cardsfolder/t/telimtors_edict.txt
index b11476bdfb1..17f804076e4 100644
--- a/forge-gui/res/cardsfolder/t/telimtors_edict.txt
+++ b/forge-gui/res/cardsfolder/t/telimtors_edict.txt
@@ -2,7 +2,7 @@ Name:Telim'Tor's Edict
 ManaCost:R
 Types:Instant
 A:SP$ ChangeZone | Cost$ R | ValidTgts$ Permanent.YouCtrl,Permanent.YouOwn | TgtPrompt$ Select target permanent you own or control | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target permanent you own or control. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Exile target permanent you own or control.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/t/thermal_flux.txt b/forge-gui/res/cardsfolder/t/thermal_flux.txt
index 93354619542..2fd269c2835 100644
--- a/forge-gui/res/cardsfolder/t/thermal_flux.txt
+++ b/forge-gui/res/cardsfolder/t/thermal_flux.txt
@@ -1,10 +1,10 @@
-Name:Thermal Flux
+Name:Thermal Flux
 ManaCost:U
 Types:Instant
 A:SP$ Charm | Cost$ U | Choices$ ChooseFreeze,ChooseThaw | Defined$ You
 SVar:ChooseFreeze:DB$ Animate | ValidTgts$ Permanent.nonSnow | TgtPrompt$ Select target nonsnow permanent | Types$ Snow | SubAbility$ DelTrigSlowtrip | SpellDescription$ Target nonsnow permanent becomes snow until end of turn. Draw a card at the beginning of the next turn's upkeep.
 SVar:ChooseThaw:DB$ Animate | ValidTgts$ Permanent.Snow | TgtPrompt$ Select target snow permanent | RemoveTypes$ Snow | SubAbility$ DelTrigSlowtrip | SpellDescription$ Target snow permanent isn't snow until end of turn. Draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Choose one —\n• Target nonsnow permanent becomes snow until end of turn.\n• Target snow permanent isn't snow until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/t/touch_of_death.txt b/forge-gui/res/cardsfolder/t/touch_of_death.txt
index 0f0652bd32e..cece93d943a 100644
--- a/forge-gui/res/cardsfolder/t/touch_of_death.txt
+++ b/forge-gui/res/cardsfolder/t/touch_of_death.txt
@@ -3,6 +3,6 @@ ManaCost:2 B
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 2 B | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker. You gain 1 life. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1 | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Touch of Death deals 1 damage to target player or planeswalker. You gain 1 life.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/t/touch_of_vitae.txt b/forge-gui/res/cardsfolder/t/touch_of_vitae.txt
index dcf082dd2cc..d01b6855c4a 100644
--- a/forge-gui/res/cardsfolder/t/touch_of_vitae.txt
+++ b/forge-gui/res/cardsfolder/t/touch_of_vitae.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Pump | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SubAbility$ DBAnimate | SpellDescription$ Until end of turn, target creature gains haste and "{0}: Untap this creature. Activate only once." Draw a card at the beginning of the next turn's upkeep.
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Abilities$ ABUntap | SubAbility$ DelTrigSlowtrip
 SVar:ABUntap:AB$ Untap | Cost$ 0 | Defined$ Self | GameActivationLimit$ 1 | SpellDescription$ Untap this creature. Activate only once.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:Until end of turn, target creature gains haste and "{0}: Untap this creature. Activate only once."\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/t/trench_behemoth.txt b/forge-gui/res/cardsfolder/t/trench_behemoth.txt
index b3ab2c960c6..0a1c7cf735a 100644
--- a/forge-gui/res/cardsfolder/t/trench_behemoth.txt
+++ b/forge-gui/res/cardsfolder/t/trench_behemoth.txt
@@ -5,8 +5,8 @@ PT:7/7
 A:AB$ Untap | Cost$ Return<1/Land> | SubAbility$ DBPump | SpellDescription$ Untap CARDNAME. It gains hexproof until end of turn.
 SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Hexproof
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ Whenever a land enters the battlefield under your control, target creature an opponent controls attacks during its controller's next combat phase if able.
-SVar:TrigEffect:DB$ Effect | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | RememberObjects$ Targeted | Triggers$ MustAttackTrig | Duration$ Permanent | ForgetOnMoved$ Battlefield
-SVar:MustAttackTrig:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ Player.controlsCreature.IsRemembered_GE1 | Execute$ TrigPump | TriggerDescription$ Target creature an opponent controls attacks during its controller's next combat phase if able.
+SVar:TrigEffect:DB$ Effect | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | RememberObjects$ Targeted | Triggers$ MustAttackTrig | Duration$ Permanent | ExileOnMoved$ Battlefield
+SVar:MustAttackTrig:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ Player.controlsCreature.IsRemembered_GE1 | Execute$ TrigPump | Static$ True | TriggerDescription$ Target creature an opponent controls attacks during its controller's next combat phase if able.
 SVar:TrigPump:DB$ Animate | Defined$ Remembered | HiddenKeywords$ CARDNAME attacks each combat if able. | Duration$ UntilEndOfCombat | SubAbility$ ExileSelf
 SVar:ExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
 SVar:BuffedBy:Land
diff --git a/forge-gui/res/cardsfolder/u/updraft.txt b/forge-gui/res/cardsfolder/u/updraft.txt
index 7f0051ef25d..045c3581082 100644
--- a/forge-gui/res/cardsfolder/u/updraft.txt
+++ b/forge-gui/res/cardsfolder/u/updraft.txt
@@ -2,6 +2,6 @@ Name:Updraft
 ManaCost:1 U
 Types:Instant
 A:SP$ Pump | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Target creature gains flying until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/u/urzas_bauble.txt b/forge-gui/res/cardsfolder/u/urzas_bauble.txt
index ae80e7cf8f3..c1fbf68c469 100644
--- a/forge-gui/res/cardsfolder/u/urzas_bauble.txt
+++ b/forge-gui/res/cardsfolder/u/urzas_bauble.txt
@@ -2,7 +2,7 @@ Name:Urza's Bauble
 ManaCost:0
 Types:Artifact
 A:AB$ Reveal | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | Random$ True | SubAbility$ DelTrigSlowtrip | SpellDescription$ Look at a card at random in target player's hand. You draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 AI:RemoveDeck:All
 Oracle:{T}, Sacrifice Urza's Bauble: Look at a card at random in target player's hand. You draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/v/vampirism.txt b/forge-gui/res/cardsfolder/v/vampirism.txt
index f15932f81ee..090a0fdc808 100644
--- a/forge-gui/res/cardsfolder/v/vampirism.txt
+++ b/forge-gui/res/cardsfolder/v/vampirism.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
-SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | Description$ Enchanted creature gets +1/+1 for each other creature you control.
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+Other | AddPower$ -1 | AddToughness$ -1 | Description$ Other creatures you control get -1/-1.