diff --git a/forge-gui/res/cardsfolder/upcoming/the_parting_of_the_ways.txt b/forge-gui/res/cardsfolder/upcoming/the_parting_of_the_ways.txt
index a91d79c04d0..fc7f781537d 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_parting_of_the_ways.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_parting_of_the_ways.txt
@@ -5,8 +5,8 @@ K:Saga:3:DBDig,DBTimeTravel,DBDestroy
 SVar:DBDig:DB$ Dig | DigNum$ 5 | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBRepeat | SpellDescription$ Exile the top five cards of your library. For each nonland card exiled this way, put a number of time counters on that card equal to its mana value. If it doesn't have suspend, it gains suspend.
 SVar:DBRepeat:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.IsRemembered+nonLand | Zone$ Exile | RepeatSubAbility$ DBPutCounter | SubAbility$ DBCleanup
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Imprinted | CounterType$ TIME | CounterNum$ X | SubAbility$ GiveSuspend
-SVar:GiveSuspend:DB$ Pump | Defined$ Remembered | KW$ Suspend | PumpZone$ Exile | Duration$ Permanent | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | ClearRemembered$ True
+SVar:GiveSuspend:DB$ PumpAll | ValidCards$ Card.IsRemembered+withoutSuspend | KW$ Suspend | PumpZone$ Exile | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Imprinted$CardManaCost
 SVar:DBTimeTravel:DB$ TimeTravel | Amount$ 2 | SpellDescription$ Time travel, then time travel.
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact.OppCtrl | TgtPrompt$ Choose up to one target artifact each opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True | SpellDescription$ For each opponent, destroy up to one target artifact that player controls.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_tenth_doctor.txt b/forge-gui/res/cardsfolder/upcoming/the_tenth_doctor.txt
index 27500e9bd66..0017d8338b1 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_tenth_doctor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_tenth_doctor.txt
@@ -5,7 +5,7 @@ PT:3/5
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Allons-y! — Whenever you attack, exile cards from the top of your library until you exile a nonland card. Put three time counters on it. If it doesn't have suspend, it gains suspend.
 SVar:TrigExile:DB$ DigUntil | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ TIME | CounterNum$ 3 | SubAbility$ GiveSuspend
-SVar:GiveSuspend:DB$ Pump | Defined$ Remembered | KW$ Suspend | PumpZone$ Exile | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:GiveSuspend:DB$ PumpAll | ValidCards$ Card.IsRemembered+withoutSuspend | KW$ Suspend | PumpZone$ Exile | Duration$ Permanent | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:HasAttackEffect:TRUE
 A:AB$ TimeTravel | Cost$ 7 | PrecostDesc$ Timey-Wimey - | SorcerySpeed$ True | Amount$ 3 | SpellDescription$ Timey-Wimey — {7}: Time travel three times. Activate only as a sorcery. (For each suspended card you own and each permanent you control with a time counter on it, you may add or remove a time counter. Then do it two more times.)
diff --git a/forge-gui/res/cardsfolder/upcoming/the_wedding_of_river_song.txt b/forge-gui/res/cardsfolder/upcoming/the_wedding_of_river_song.txt
index 80d1fc0864a..cb56c8c432b 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_wedding_of_river_song.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_wedding_of_river_song.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Sorcery
 A:SP$ Draw | DrawNum$ 2 | SubAbility$ DBExile | SpellDescription$ Draw two cards, then you may exile a nonland card from your hand with a number of time counters on it equal to its mana value. Then target opponent does the same. Cards exiled this way that don't have suspend gain suspend.
 SVar:DBExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | ChangeType$ Card.nonLand | WithCountersType$ TIME | WithCountersAmount$ X | RememberChanged$ True | SubAbility$ OppExile
-SVar:OppExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | Chooser$ Targeted | Hidden$ True | Mandatory$ True | WithCountersType$ TIME | WithCountersAmount$ Y | ChangeType$ Card.nonLand | Imprint$ True |  SubAbility$ GiveSuspend
+SVar:OppExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | Chooser$ Targeted | Hidden$ True | WithCountersType$ TIME | WithCountersAmount$ Y | ChangeType$ Card.nonLand | Imprint$ True |  SubAbility$ GiveSuspend
 SVar:GiveSuspend:DB$ PumpAll | ValidCards$ Card.IsRemembered+withoutSuspend,Card.IsImprinted+withoutSuspend | KW$ Suspend | PumpZone$ Exile | Duration$ Permanent | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 SVar:X:Remembered$CardManaCost