diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index c7aefc1fa7f..7fa41122527 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -175,7 +175,7 @@ public class AbilityUtils {
             }
         } else if (defined.equals("DelayTriggerRemembered")) {
             if (sa.isTrigger()) {
-               for (Object o : sa.getTriggerRemembered()) {
+               for (Object o : sa.getRootAbility().getTriggerRemembered()) {
                    if (o instanceof Card) {
                        cards.add(game.getCardState((Card) o));
                    }
@@ -832,7 +832,7 @@ public class AbilityUtils {
         }
         else if (defined.equals("DelayTriggerRemembered")) {
             if (sa.isTrigger()) {
-                for (Object o : sa.getTriggerRemembered()) {
+                for (Object o : sa.getRootAbility().getTriggerRemembered()) {
                     if (o instanceof Player) {
                         players.add((Player) o);
                     }
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
index 15a5ecf275e..b1d71844b4b 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
@@ -21,6 +21,7 @@ import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.trigger.TriggerType;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -71,6 +72,7 @@ public class SpellAbilityStackInstance {
 
     // Triggers
     private HashMap<String, Object> triggeringObjects = new HashMap<String, Object>();
+    private List<Object> triggerRemembered = new ArrayList<Object>();
 
     private final HashMap<String, String> storedSVars = new HashMap<String, String>();
 
@@ -98,6 +100,7 @@ public class SpellAbilityStackInstance {
 
         // Triggering info
         this.triggeringObjects = sa.getTriggeringObjects();
+        this.triggerRemembered = sa.getTriggerRemembered();
 
         final AbilitySub subAb = this.ability.getSubAbility();
         if (subAb != null) {
@@ -149,6 +152,7 @@ public class SpellAbilityStackInstance {
 
         // Triggered
         this.ability.setAllTriggeringObjects(this.triggeringObjects);
+        this.ability.setTriggerRemembered(this.triggerRemembered);
 
         // Add SVars back in
         final Card source = this.ability.getHostCard();
diff --git a/forge-gui/res/cardsfolder/m/mistmeadow_witch.txt b/forge-gui/res/cardsfolder/m/mistmeadow_witch.txt
index f155f4ac95b..1b3902474d7 100644
--- a/forge-gui/res/cardsfolder/m/mistmeadow_witch.txt
+++ b/forge-gui/res/cardsfolder/m/mistmeadow_witch.txt
@@ -2,9 +2,9 @@ Name:Mistmeadow Witch
 ManaCost:1 WU
 Types:Creature Kithkin Wizard
 PT:1/1
-A:AB$ ChangeZone | Cost$ 2 W U | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | SubAbility$ DelTrig | SpellDescription$ Exile target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step.
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return the exiled creature to the battlefield.
-SVar:TrigReturn:DB$ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+A:AB$ ChangeZone | Cost$ 2 W U | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ Return the exiled creature to the battlefield.
+SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mistmeadow_witch.jpg
 Oracle:{2}{W}{U}: Exile target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/mystifying_maze.txt b/forge-gui/res/cardsfolder/m/mystifying_maze.txt
index e1c256548b9..341c9dfcc8b 100644
--- a/forge-gui/res/cardsfolder/m/mystifying_maze.txt
+++ b/forge-gui/res/cardsfolder/m/mystifying_maze.txt
@@ -2,9 +2,9 @@ Name:Mystifying Maze
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add {1} to your mana pool.
-A:AB$ ChangeZone | Cost$ 4 T | ValidTgts$ Creature.attacking+OppCtrl | TgtPrompt$ Select target attacking creature an opponent controls | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | SubAbility$ DelTrig | SpellDescription$ Exile target attacking creature an opponent controls. At the beginning of the next end step, return it to the battlefield tapped under its owner's control.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled card to the battlefield.
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered | Tapped$ True | SubAbility$ DBCleanup
+A:AB$ ChangeZone | Cost$ 4 T | ValidTgts$ Creature.attacking+OppCtrl | TgtPrompt$ Select target attacking creature an opponent controls | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile target attacking creature an opponent controls. At the beginning of the next end step, return it to the battlefield tapped under its owner's control.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ Return exiled card to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered | Tapped$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystifying_maze.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{4}, {T}: Exile target attacking creature an opponent controls. At the beginning of the next end step, return it to the battlefield tapped under its owner's control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/n/norin_the_wary.txt b/forge-gui/res/cardsfolder/n/norin_the_wary.txt
index 09085bc9ef3..95e713c26b2 100644
--- a/forge-gui/res/cardsfolder/n/norin_the_wary.txt
+++ b/forge-gui/res/cardsfolder/n/norin_the_wary.txt
@@ -4,9 +4,9 @@ Types:Legendary Creature Human Warrior
 PT:2/1
 T:Mode$ SpellCast | ValidCard$ Card | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ When a player casts a spell or a creature attacks, exile CARDNAME. Return it to the battlefield under its owner's control at the beginning of the next end step.
 T:Mode$ Attacks | ValidCard$ Creature | Execute$ TrigExile | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ When a player casts a spell or a creature attacks, exile CARDNAME. Return it to the battlefield under its owner's control at the beginning of the next end step.
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield
-SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Exile | Destination$ Battlefield
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Exile | Destination$ Battlefield
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/norin_the_wary.jpg
 Oracle:When a player casts a spell or a creature attacks, exile Norin the Wary. Return it to the battlefield under its owner's control at the beginning of the next end step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/o/otherworldly_journey.txt b/forge-gui/res/cardsfolder/o/otherworldly_journey.txt
index 62b050aa1fc..2f746bba06c 100644
--- a/forge-gui/res/cardsfolder/o/otherworldly_journey.txt
+++ b/forge-gui/res/cardsfolder/o/otherworldly_journey.txt
@@ -1,9 +1,9 @@
 Name:Otherworldly Journey
 ManaCost:1 W
 Types:Instant Arcane
-A:SP$ ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | RememberTargets$ True | ForgetOtherTargets$ True | TgtPrompt$ Select target creature | SubAbility$ DelTrig | SpellDescription$ Exile target creature. At end of turn, return that card to the battlefield under its owner's control with a +1/+1 counter on it.
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled card to the battlefield with a +1/+1 counter on it.
-SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBAddCounter
-SVar:DBAddCounter:DB$ PutCounter | Cost$ 0 | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 1
+A:SP$ ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | RememberChanged$ True | TgtPrompt$ Select target creature | SubAbility$ DelTrig | SpellDescription$ Exile target creature. At end of turn, return that card to the battlefield under its owner's control with a +1/+1 counter on it.
+SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ Return exiled card to the battlefield with a +1/+1 counter on it. | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Exile | Destination$ Battlefield | WithCounters$ P1P1_1
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/otherworldly_journey.jpg
 Oracle:Exile target creature. At the beginning of the next end step, return that card to the battlefield under its owner's control with a +1/+1 counter on it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/planar_guide.txt b/forge-gui/res/cardsfolder/p/planar_guide.txt
index 9b44f0d4612..66299a9936b 100644
--- a/forge-gui/res/cardsfolder/p/planar_guide.txt
+++ b/forge-gui/res/cardsfolder/p/planar_guide.txt
@@ -3,9 +3,9 @@ ManaCost:W
 Types:Creature Human Cleric
 PT:1/1
 A:AB$ ChangeZoneAll | Cost$ 3 W Exile<1/CARDNAME> | ChangeType$ Creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile all creatures. At the beginning of the next end step, return those cards to the battlefield under their owners' control.
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return cards exiled by CARDNAME to the battlefield.
-SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ Return cards exiled by CARDNAME to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Exile | Destination$ Battlefield
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/planar_guide.jpg
 Oracle:{3}{W}, Exile Planar Guide: Exile all creatures. At the beginning of the next end step, return those cards to the battlefield under their owners' control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/roon_of_the_hidden_realm.txt b/forge-gui/res/cardsfolder/r/roon_of_the_hidden_realm.txt
index ad727005a87..d017b750e38 100644
--- a/forge-gui/res/cardsfolder/r/roon_of_the_hidden_realm.txt
+++ b/forge-gui/res/cardsfolder/r/roon_of_the_hidden_realm.txt
@@ -4,9 +4,9 @@ Types:Legendary Creature Rhino Soldier
 PT:4/4
 K:Vigilance
 K:Trample
-A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.Other | Mandatory$ True | TgtPrompt$ Select another target creature | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DelTrig | SpellDescription$ Exile another target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigBounce | TriggerDescription$ Return exiled creature to the battlefield.
-SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered | SubAbility$ DBCleanup
+A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.Other | Mandatory$ True | TgtPrompt$ Select another target creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile another target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigBounce | RememberObjects$ Remembered | TriggerDescription$ Return exiled creature to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/roon_of_the_hidden_realm.jpg
 Oracle:Vigilance, trample\n{2}, {T}: Exile another target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/s/skirk_alarmist.txt b/forge-gui/res/cardsfolder/s/skirk_alarmist.txt
index a243d44789f..7b59ec51905 100644
--- a/forge-gui/res/cardsfolder/s/skirk_alarmist.txt
+++ b/forge-gui/res/cardsfolder/s/skirk_alarmist.txt
@@ -4,8 +4,8 @@ Types:Creature Human Wizard
 PT:1/2
 K:Haste
 A:AB$ SetState | Cost$ T | ValidTgts$ Creature.YouCtrl+faceDown | RememberChanged$ True | Mode$ TurnFace | SubAbility$ DBDelTrig | SpellDescription$ Turn target face-down creature you control face up. At the beginning of the next end step, sacrifice it.
-SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigSac | TriggerDescription$ At the beginning of the next end step, sacrifice it.
-SVar:TrigSac:AB$ SacrificeAll | Cost$ 0 | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigSac | RememberObjects$ Remembered | TriggerDescription$ At the beginning of the next end step, sacrifice it. | SubAbility$ DBCleanup
+SVar:TrigSac:AB$ SacrificeAll | Cost$ 0 | Defined$ DelayTriggerRemembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skirk_alarmist.jpg
diff --git a/forge-gui/res/cardsfolder/s/sudden_disappearance.txt b/forge-gui/res/cardsfolder/s/sudden_disappearance.txt
index dd177171ad7..d5d671f2f19 100644
--- a/forge-gui/res/cardsfolder/s/sudden_disappearance.txt
+++ b/forge-gui/res/cardsfolder/s/sudden_disappearance.txt
@@ -1,9 +1,10 @@
 Name:Sudden Disappearance
 ManaCost:5 W
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 5 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Permanent.nonLand | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DelTrig | IsCurse$ True | SpellDescription$ Exile all nonland permanents target player controls. Return the exiled cards to the battlefield under their owners control at the beginning of the next end step.
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled permanents to the battlefield.
-SVar:TrigReturn:DB$ChangeZoneAll | Origin$ Exile | Destination$ Battlefield | ChangeType$ Card.IsRemembered
+A:SP$ ChangeZoneAll | Cost$ 5 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Permanent.nonLand | RememberChanged$ True | SubAbility$ DelTrig | IsCurse$ True | SpellDescription$ Exile all nonland permanents target player controls. Return the exiled cards to the battlefield under their owners control at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ Return exiled permanents to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sudden_disappearance.jpg
 Oracle:Exile all nonland permanents target player controls. Return the exiled cards to the battlefield under their owner's control at the beginning of the next end step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/v/venser_the_sojourner.txt b/forge-gui/res/cardsfolder/v/venser_the_sojourner.txt
index 6ba44d3488b..10efa354957 100644
--- a/forge-gui/res/cardsfolder/v/venser_the_sojourner.txt
+++ b/forge-gui/res/cardsfolder/v/venser_the_sojourner.txt
@@ -2,9 +2,9 @@ Name:Venser, the Sojourner
 ManaCost:3 W U
 Types:Planeswalker Venser
 Loyalty:3
-A:AB$ ChangeZone | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Permanent.YouOwn | TgtPrompt$ Select target permanent you own | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | SubAbility$ DelTrig | SpellDescription$  Exile target permanent you own. Return it to the battlefield under your control at the beginning of the next end step.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled card to the battlefield.
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered | SubAbility$ DBCleanup
+A:AB$ ChangeZone | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Permanent.YouOwn | TgtPrompt$ Select target permanent you own | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$  Exile target permanent you own. Return it to the battlefield under your control at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ Return exiled card to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Effect | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Name$ Venser, the Sojourner Effect | StaticAbilities$ KWPump | SpellDescription$ Creatures are unblockable this turn.
 SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature | AddHiddenKeyword$ Unblockable | Description$ creatures are unblockable this turn.
diff --git a/forge-gui/res/cardsfolder/v/voyager_staff.txt b/forge-gui/res/cardsfolder/v/voyager_staff.txt
index 4ca6690e5f1..d6578976ab7 100644
--- a/forge-gui/res/cardsfolder/v/voyager_staff.txt
+++ b/forge-gui/res/cardsfolder/v/voyager_staff.txt
@@ -1,9 +1,10 @@
 Name:Voyager Staff
 ManaCost:1
 Types:Artifact
-A:AB$ChangeZone | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DelTrig | SpellDescription$ Exile target creature. Return the exiled card to the battlefield under its owner's control at the beginning of the next end step.
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled creatures to the battlefield.
-SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered
+A:AB$ ChangeZone | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile target creature. Return the exiled card to the battlefield under its owner's control at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ Return exiled creatures to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/voyager_staff.jpg
 Oracle:{2}, Sacrifice Voyager Staff: Exile target creature. Return the exiled card to the battlefield under its owner's control at the beginning of the next end step.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/z/zirilan_of_the_claw.txt b/forge-gui/res/cardsfolder/z/zirilan_of_the_claw.txt
index 85ed06de7d4..efec35e5fbf 100644
--- a/forge-gui/res/cardsfolder/z/zirilan_of_the_claw.txt
+++ b/forge-gui/res/cardsfolder/z/zirilan_of_the_claw.txt
@@ -2,10 +2,10 @@ Name:Zirilan of the Claw
 ManaCost:3 R R
 Types:Legendary Creature Viashino Shaman
 PT:3/4
-A:AB$ ChangeZone | Cost$ 1 R R T | Origin$ Library | Destination$ Battlefield | ChangeType$ Dragon | ChangeNum$ 1 | Shuffle$ True | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | AILogic$ BeforeCombat | SpellDescription$ Search your library for a Dragon permanent card and put that card onto the battlefield. Then shuffle your library. That Dragon gains haste until end of turn. Exile it at the beginning of the next end step.
+A:AB$ ChangeZone | Cost$ 1 R R T | Origin$ Library | Destination$ Battlefield | ChangeType$ Dragon | ChangeNum$ 1 | Shuffle$ True | SubAbility$ DBPump | RememberChanged$ True | AILogic$ BeforeCombat | SpellDescription$ Search your library for a Dragon permanent card and put that card onto the battlefield. Then shuffle your library. That Dragon gains haste until end of turn. Exile it at the beginning of the next end step.
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBDelTrig
-SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigExile
-SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBCleanup
+SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigExile | TriggerDescription$ Exile it at the beginning of the next end step. | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zirilan_of_the_claw.jpg
 Oracle:{1}{R}{R}, {T}: Search your library for a Dragon permanent card and put that card onto the battlefield. Then shuffle your library. That Dragon gains haste until end of turn. Exile it at the beginning of the next end step.
\ No newline at end of file