diff --git a/forge-gui/res/cardsfolder/a/awaken_the_erstwhile.txt b/forge-gui/res/cardsfolder/a/awaken_the_erstwhile.txt
index 924da38ece1..79b028eebc8 100644
--- a/forge-gui/res/cardsfolder/a/awaken_the_erstwhile.txt
+++ b/forge-gui/res/cardsfolder/a/awaken_the_erstwhile.txt
@@ -2,7 +2,10 @@ Name:Awaken the Erstwhile
 ManaCost:3 B B
 Types:Sorcery
 A:SP$ RepeatEach | Cost$ 3 B B | RepeatPlayers$ Player | RepeatSubAbility$ DBDiscard | SpellDescription$ Each player discards all the cards in their hand, then creates that many 2/2 black Zombie creature tokens.
-SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ b_2_2_zombie | TokenOwner$ You | LegacyImage$ b 2 2 zombie rna | References$ X
+SVar:DBDiscard:DB$ Discard | Defined$ Player.IsRemembered | Mode$ Hand | RememberDiscarded$ True | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ b_2_2_zombie | TokenOwner$ Player.IsRemembered | LegacyImage$ b 2 2 zombie rna | References$ X | SubAbility$ DBCleanup 
 SVar:X:Remembered$Amount
-DeckHas:Ability$Token
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Discard
+DeckHints:Keyword$Madness & Ability$Delirium
 Oracle:Each player discards all the cards in their hand, then creates that many 2/2 black Zombie creature tokens.