diff --git a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
index 5cc2fd57fcf..fb6ac190ba6 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
@@ -96,20 +96,21 @@ public class MakeCardEffect extends SpellAbilityEffect {
             }
 
             if (!faces.isEmpty()) {
-                if (sa.hasParam("AtRandom")) {
-                    names.add(Aggregates.random(faces).getName());
-                } else {
-                    int i = sa.hasParam("SpellbookAmount") ?
-                            AbilityUtils.calculateAmount(source, sa.getParam("SpellbookAmount"), sa) : 1;
-                    while (i > 0) {
+                int i = sa.hasParam("SpellbookAmount") ?
+                        AbilityUtils.calculateAmount(source, sa.getParam("SpellbookAmount"), sa) : 1;
+                while (i > 0) {
+                    String chosen;
+                    if (sa.hasParam("AtRandom")) {
+                        chosen = Aggregates.random(faces).getName();
+                    } else {
                         String sbName = sa.hasParam("SpellbookName") ? sa.getParam("SpellbookName") :
                                 CardTranslation.getTranslatedName(source.getName());
-                        String chosen = player.getController().chooseCardName(sa, faces,
+                        chosen = player.getController().chooseCardName(sa, faces,
                                 Localizer.getInstance().getMessage("lblChooseFromSpellbook", sbName));
-                        names.add(chosen);
-                        faces.remove(StaticData.instance().getCommonCards().getFaceByName(chosen));
-                        i--;
                     }
+                    names.add(chosen);
+                    faces.remove(StaticData.instance().getCommonCards().getFaceByName(chosen));
+                    i--;
                 }
             }
 
diff --git a/forge-gui/res/cardsfolder/b/bruna_light_of_alabaster.txt b/forge-gui/res/cardsfolder/b/bruna_light_of_alabaster.txt
index 7616657d4b5..959cccdda6f 100644
--- a/forge-gui/res/cardsfolder/b/bruna_light_of_alabaster.txt
+++ b/forge-gui/res/cardsfolder/b/bruna_light_of_alabaster.txt
@@ -6,12 +6,12 @@ K:Flying
 K:Vigilance
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ Aurify | TriggerDescription$ Whenever CARDNAME attacks or blocks, you may attach to it any number of Auras on the battlefield and you may put onto the battlefield attached to it any number of Aura cards that could enchant it from your graveyard and/or hand.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ Aurify | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, you may attach to it any number of Auras on the battlefield and you may put onto the battlefield attached to it any number of Aura cards that could enchant it from your graveyard and/or hand.
-SVar:Aurify:DB$ RepeatEach | RepeatSubAbility$ BrunaAttach | RepeatCards$ Aura.CanEnchantSource+NotAttachedTo | SubAbility$ HandAuras
+SVar:Aurify:DB$ RepeatEach | RepeatSubAbility$ BrunaAttach | RepeatCards$ Aura.CanEnchantSource+NotAttachedTo | SubAbility$ ZoneAuras
 SVar:BrunaAttach:DB$ Attach | Object$ Remembered | Defined$ Self | Optional$ True
-SVar:HandAuras:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource+YouCtrl | AttachedTo$ Self | ChangeNum$ HandX | Optional$ True | Hidden$ True | SubAbility$ GraveAuras
-SVar:GraveAuras:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource+YouCtrl | AttachedTo$ Self | ChangeNum$ GraveX | Optional$ True | Hidden$ True
-SVar:HandX:Count$ValidHand Aura.CanEnchantSource+YouCtrl
-SVar:GraveX:Count$ValidGraveyard Aura.CanEnchantSource+YouCtrl
+SVar:ZoneAuras:DB$ ChangeZone | Origin$ Hand,Graveyard | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource+YouOwn | AttachedTo$ Self | ChangeNum$ Count | Optional$ True | Hidden$ True
+SVar:Count:Count$ValidHand,Graveyard Aura.CanEnchantSource+YouOwn
 SVar:HasAttackEffect:TRUE
 SVar:HasBlockEffect:TRUE
+DeckNeeds:Type$Aura
+DeckHas:Ability$Graveyard
 Oracle:Flying, vigilance\nWhenever Bruna, Light of Alabaster attacks or blocks, you may attach to it any number of Auras on the battlefield and you may put onto the battlefield attached to it any number of Aura cards that could enchant it from your graveyard and/or hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/stormkeld_curator_giant_secrets.txt b/forge-gui/res/cardsfolder/upcoming/stormkeld_curator_giant_secrets.txt
new file mode 100644
index 00000000000..8774279faf9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/stormkeld_curator_giant_secrets.txt
@@ -0,0 +1,20 @@
+Name:Stormkeld Curator
+ManaCost:4 W
+Types:Creature Giant
+PT:6/6
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAurify | TriggerDescription$ When CARDNAME enters the battlefield, you may put any number of Aura cards from your graveyard and/or hand onto the battlefield attached to it.
+SVar:TrigAurify:DB$ ChangeZone | Origin$ Hand,Graveyard | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource+YouOwn | AttachedTo$ Self | ChangeNum$ Count | Optional$ True | Hidden$ True
+SVar:Count:Count$ValidHand,Graveyard Aura.CanEnchantSource+YouOwn
+DeckHints:Type$Aura
+DeckHas:Type$Aura|Enchantment & Ability$Graveyard
+AlternateMode:Adventure
+Oracle:When Stormkeld Curator enters the battlefield, you may put any number of Aura cards from your graveyard and/or hand onto the battlefield attached to it.
+
+ALTERNATE
+
+Name:Giant Secrets
+ManaCost:X U U
+Types:Instant Adventure
+A:SP$ MakeCard | SpellbookAmount$ X | Conjure$ True | AtRandom$ True | Spellbook$ Aether Tunnel,All That Glitters,Celestial Mantle,Curator's Ward,Curiosity,Ethereal Armor,Face of Divinity,Knightly Valor,Metamorphic Alteration,On Serra's Wings,Rousing Read,Staggering Insight,Take Flight | Zone$ Hand | SpellDescription$ Conjure X random cards from CARDNAME's spellbook into your hand.
+SVar:X:Count$xPaid
+Oracle:Conjure X random cards from Giant Secrets's spellbook into your hand.