diff --git a/forge-gui/res/cardsfolder/upcoming/unlicensed_hearse.txt b/forge-gui/res/cardsfolder/upcoming/unlicensed_hearse.txt
index 10e3f3e2e0a..4fcf1621d53 100644
--- a/forge-gui/res/cardsfolder/upcoming/unlicensed_hearse.txt
+++ b/forge-gui/res/cardsfolder/upcoming/unlicensed_hearse.txt
@@ -2,12 +2,11 @@ Name:Unlicensed Hearse
 ManaCost:2
 Types:Artifact Vehicle
 PT:*/*
-A:AB$ ChangeZone | Cost$ T | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBStore | TgtPrompt$ Select up to two target cards in a graveyard | ValidTgts$ Card | RememberChanged$ True | SpellDescription$ Exile up to two target cards from a single graveyard.
-SVar:DBStore:DB$ StoreSVar | SVar$ ExiledAmount | Type$ CountSVar | Expression$ ExiledAmount/Plus.X | SubAbility$ DBCleanup
+A:AB$ ChangeZone | Cost$ T | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | TgtPrompt$ Select up to two target cards in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to two target cards from a single graveyard.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards exiled with it.
+T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ ExiledAmount | SetToughness$ ExiledAmount | Description$ CARDNAME's power and toughness are each equal to the number of cards exiled with it.
-SVar:X:Remembered$Amount
-SVar:ExiledAmount:Number$0
+SVar:X:Count$ValidExile Card.IsRemembered+ExiledWithSource
 K:Crew:2
 DeckHas:Ability$Graveyard
 DeckHints:Ability$Mill