diff --git a/forge-gui/res/cardsfolder/upcoming/dream_eater.txt b/forge-gui/res/cardsfolder/upcoming/dream_eater.txt
index d8bd55d9b7a..fddbdb90ac9 100644
--- a/forge-gui/res/cardsfolder/upcoming/dream_eater.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dream_eater.txt
@@ -5,6 +5,7 @@ PT:4/3
 K:Flash
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 4. When you do, you may return target nonland permanent an opponent controls to its owner's hand.
-SVar:TrigSurveil:DB$Surveil | Defined$ You | Amount$ 4 | SubAbility$ TrigBounce
+SVar:TrigSurveil:DB$ Surveil | Defined$ You | Amount$ 4 | SubAbility$ TrigImmediate
+SVar:TrigImmediate:DB$ ImmediateTrigger | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ When you do, you may return target nonland permanent an opponent controls to its owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Origin$ Battlefield | Destination$ Hand
 Oracle:Flash\nFlying\nWhen Dream Eater enters the battlefield, surveil 4. When you do, you may return target nonland permanent an opponent controls to its owner's hand. (To surveil 4, look at the top four cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/hypothesizzle.txt b/forge-gui/res/cardsfolder/upcoming/hypothesizzle.txt
index 3d05602ccb1..efbdaa67b82 100644
--- a/forge-gui/res/cardsfolder/upcoming/hypothesizzle.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hypothesizzle.txt
@@ -1,6 +1,7 @@
 Name:Hypothesizzle
 ManaCost:3 U R
 Types:Instant
-A:SP$ Draw | Cost$ 3 U R | NumCards$ 2 | SubAbility$ DBDealDamage | SpellDescription$ Draw two cards. Then you may discard a nonland card. When you do, CARDNAME deals 4 damage to target creature.
-SVar:DBDealDamage:DB$ DealDamage | Cost$ Discard<1/Card.nonLand/nonland card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
+A:SP$ Draw | Cost$ 3 U R | NumCards$ 2 | SubAbility$ DBImmediateTrigger | SpellDescription$ Draw two cards. Then you may discard a nonland card. When you do, CARDNAME deals 4 damage to target creature.
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigDealDmg | TriggerDescription$ You may discard a nonland card. When you do, CARDNAME deals 4 damage to target creature. | UnlessCost$ Discard<1/Card.nonLand/nonland card> | UnlessPayer$ You | UnlessSwitched$ True
+SVar:TrigDealDmg:DB$ DealDamage | Cost$ Discard<1/Card.nonLand/nonland card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
 Oracle:Draw two cards. Then you may discard a nonland card. When you do, Hypothesizzle deals 4 damage to target creature.