diff --git a/forge-gui/res/cardsfolder/t/the_great_aurora.txt b/forge-gui/res/cardsfolder/t/the_great_aurora.txt
index f789d1400be..ef15a086bf2 100644
--- a/forge-gui/res/cardsfolder/t/the_great_aurora.txt
+++ b/forge-gui/res/cardsfolder/t/the_great_aurora.txt
@@ -1,12 +1,16 @@
 Name:The Great Aurora
 ManaCost:6 G G G
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 6 G G G | RepeatPlayers$ Player | RepeatSubAbility$ DBShuffle | SubAbility$ RepeatLands | StackDescription$ SpellDescription | SpellDescription$ Each player shuffles all cards from his or her hand and all permanents he or she owns into his or her library, then draws that many cards. Each player may put any number of land cards from his or her hand onto the battlefield. Exile The Great Aurora.
+A:SP$ RepeatEach | Cost$ 6 G G G | RepeatPlayers$ Player | RepeatSubAbility$ DBStoreAmount | SubAbility$ RepeatLands | StackDescription$ SpellDescription | SpellDescription$ Each player shuffles all cards from his or her hand and all permanents he or she owns into his or her library, then draws that many cards. Each player may put any number of land cards from his or her hand onto the battlefield. Exile The Great Aurora.
 # ChangeType is fine being "Card" because if it's on the battlefield, it has to be a permanent
-SVar:DBShuffle:DB$ ChangeZoneAll | ChangeType$ Card.RememberedPlayerCtrl | Imprint$ True | Origin$ Hand,Battlefield | Destination$ Library | Shuffle$ True | SubAbility$ DBDraw
+SVar:DBStoreAmount:DB$ StoreSVar | SVar$ AuroraY | Type$ Count | Expression$ Valid Card.RememberedPlayerOwn | SubAbility$ DBStoreAmount2
+SVar:DBStoreAmount2:DB$ StoreSVar | SVar$ AuroraZ | Type$ Count | Expression$ ValidHand Card.RememberedPlayerOwn | SubAbility$ DBShuffle
+SVar:DBShuffle:DB$ ChangeZoneAll | ChangeType$ Card.RememberedPlayerOwn | Origin$ Hand,Battlefield | Destination$ Library | Shuffle$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ Remembered | NumCards$ AuroraX | References$ AuroraX | SubAbility$ DBCleanImprint
 SVar:DBCleanImprint:DB$ Cleanup | ClearImprinted$ True
-SVar:AuroraX:Imprinted$Amount
+SVar:AuroraX:SVar$AuroraY/Plus.AuroraZ
+SVar:AuroraY:Number$0
+SVar:AuroraZ:Number$0
 SVar:RepeatLands:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBAurora | SubAbility$ DBCleanup
 SVar:DBAurora:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | DefinedPlayer$ Remembered | Chooser$ Remembered | ChangeType$ Land | ChangeNum$ HandSize | References$ HandSize
 SVar:HandSize:Count$ValidHand Land.RememberedPlayerCtrl