diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index de647f176d6..e4a40ffc851 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -387,10 +387,6 @@ public class CardProperty {
             if (!card.canBeSacrificedBy((SpellAbility) spellAbility, false)) {
                 return false;
             }
-        } else if (property.startsWith("AttachedBy")) {
-            if (!card.hasCardAttachment(source)) {
-                return false;
-            }
         } else if (property.equals("Attached")) {
             if (!source.hasCardAttachment(card)) {
                 return false;
@@ -498,7 +494,7 @@ public class CardProperty {
                     return false;
                 }
             }
-        } else if (property.startsWith("EquippedBy")) {
+        } else if (property.startsWith("EquippedBy") || property.startsWith("AttachedBy")) {
             if (property.substring(10).equals("Targeted")) {
                 for (final Card c : AbilityUtils.getDefinedCards(source, "Targeted", spellAbility)) {
                     if (!card.hasCardAttachment(c)) {
@@ -523,11 +519,6 @@ public class CardProperty {
             if (!card.canBeAttached(source, null)) {
                 return false;
             }
-        } else if (property.startsWith("Fortified")) {
-            // FIXME TODO what property has this?
-            if (!source.hasCardAttachment(card)) {
-                return false;
-            }
         } else if (property.startsWith("HauntedBy")) {
             if (!card.isHauntedBy(source)) {
                 return false;
diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index fcdfe3302f6..e4bf85331e9 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -59,6 +59,7 @@ import forge.game.spellability.OptionalCost;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;
 import forge.game.spellability.TargetChoices;
+import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerType;
 import forge.game.trigger.WrappedAbility;
 import forge.util.TextUtil;
@@ -835,6 +836,8 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             if (activator.equals(activePlayer)) {
                 activePlayerSAs.add(sa);
             }
+
+            adjustAuraHost(sa);
         }
         simultaneousStackEntryList.removeAll(activePlayerSAs);
 
@@ -847,6 +850,18 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         return true;
     }
 
+    // 400.7f Abilities of Auras that trigger when the enchanted permanent leaves the battlefield
+    // can find the new object that Aura became in its owner’s graveyard
+    public void adjustAuraHost(SpellAbility sa) {
+        final Card host = sa.getHostCard();
+        final Trigger trig = sa.getTrigger();
+        final Card newHost = game.getCardState(host);
+        if (host.isAura() && newHost.isInZone(ZoneType.Graveyard) && trig.getMode() == TriggerType.ChangesZone && 
+                trig.getParam("Destination").equals("Graveyard") && trig.getParam("ValidCard").equals("Card.EnchantedBy")) {
+            sa.setHostCard(newHost);
+        }
+    }
+
     public final boolean hasStateTrigger(final int triggerID) {
         for (final SpellAbilityStackInstance sasi : stack) {
             if (sasi.isStateTrigger(triggerID)) {
diff --git a/forge-gui/res/cardsfolder/a/angelic_destiny.txt b/forge-gui/res/cardsfolder/a/angelic_destiny.txt
index 1929882addf..077c049db05 100644
--- a/forge-gui/res/cardsfolder/a/angelic_destiny.txt
+++ b/forge-gui/res/cardsfolder/a/angelic_destiny.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 4 | AddToughness$ 4 | AddKeyword$ Flying & First Strike | AddType$ Angel | Description$ Enchanted creature gets +4/+4, has flying and first strike, and is an Angel in addition to its other types.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return CARDNAME to its owner's hand.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ CorrectedSelf
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return CARDNAME to its owner's hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ Self
 Oracle:Enchant creature\nEnchanted creature gets +4/+4, has flying and first strike, and is an Angel in addition to its other types.\nWhen enchanted creature dies, return Angelic Destiny to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/c/crush_underfoot.txt b/forge-gui/res/cardsfolder/c/crush_underfoot.txt
index 6e450331d28..5e0ad537827 100644
--- a/forge-gui/res/cardsfolder/c/crush_underfoot.txt
+++ b/forge-gui/res/cardsfolder/c/crush_underfoot.txt
@@ -3,6 +3,6 @@ ManaCost:1 R
 Types:Tribal Instant Giant
 A:SP$ ChooseCard | Cost$ 1 R | Defined$ You | Mandatory$ True | Choices$ Creature.Giant+YouCtrl | ChoiceTitle$ Choose a Giant creature you control | SubAbility$ DBDmg | SpellDescription$ Choose a Giant creature you control. It deals damage equal to its power to target creature.
 SVar:DBDmg:DB$ DealDamage | NumDmg$ X | DamageSource$ ChosenCard | ValidTgts$ Creature
-SVar:X:ChosenCard$CardPower
+SVar:X:Count$Valid Card.ChosenCard$CardPower
 AI:RemoveDeck:Random
 Oracle:Choose a Giant creature you control. It deals damage equal to its power to target creature.
diff --git a/forge-gui/res/cardsfolder/e/endless_evil.txt b/forge-gui/res/cardsfolder/e/endless_evil.txt
index f74f16f6f4a..239ee094559 100644
--- a/forge-gui/res/cardsfolder/e/endless_evil.txt
+++ b/forge-gui/res/cardsfolder/e/endless_evil.txt
@@ -5,8 +5,8 @@ K:Enchant creature you control
 A:SP$ Attach | ValidTgts$ Creature.YouCtrl | AILogic$ HighestEvaluation
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, create a token that's a copy of enchanted creature, except it's a 1/1.
 SVar:TrigCopy:DB$ CopyPermanent | Defined$ Enchanted | SetPower$ 1 | SetToughness$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, if that creature was a Horror, return CARDNAME to its owner's hand.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ CorrectedSelf | ConditionDefined$ TriggeredCardLKICopy | ConditionPresent$ Creature.Horror | ConditionCompare$ EQ1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, if that creature was a Horror, return CARDNAME to its owner's hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ Self | ConditionDefined$ TriggeredCardLKICopy | ConditionPresent$ Creature.Horror | ConditionCompare$ EQ1
 DeckHints:Type$Horror
 DeckHas:Ability$Token
 Oracle:Enchant creature you control\nAt the beginning of your upkeep, create a token that's a copy of enchanted creature, except it's a 1/1.\nWhen enchanted creature dies, if that creature was a Horror, return Endless Evil to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/g/genju_of_the_cedars.txt b/forge-gui/res/cardsfolder/g/genju_of_the_cedars.txt
index 45f0f8a1b5c..32a02484a9d 100644
--- a/forge-gui/res/cardsfolder/g/genju_of_the_cedars.txt
+++ b/forge-gui/res/cardsfolder/g/genju_of_the_cedars.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 K:Enchant Forest
 A:SP$ Attach | Cost$ G | ValidTgts$ Forest | AILogic$ Pump
 A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 4 | Toughness$ 4 | Types$ Creature,Spirit | Colors$ Green | SpellDescription$ Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land.
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Forest is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
-SVar:TrigReturnOwner:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+T:Mode$ ChangesZone | ValidCard$ Card.EnchantedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Forest is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
+SVar:TrigReturnOwner:DB$ ChangeZone | Hidden$ True | ChangeType$ Card.StrictlySelf | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Hand | Mandatory$ True
 SVar:NonStackingAttachEffect:True
 SVar:AIPaymentPreference:AvoidPayingWithAttachTarget
 Oracle:Enchant Forest\n{2}: Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land.\nWhen enchanted Forest is put into a graveyard, you may return Genju of the Cedars from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/g/genju_of_the_falls.txt b/forge-gui/res/cardsfolder/g/genju_of_the_falls.txt
index cf3c49b46b5..39c48f41dfd 100644
--- a/forge-gui/res/cardsfolder/g/genju_of_the_falls.txt
+++ b/forge-gui/res/cardsfolder/g/genju_of_the_falls.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 K:Enchant Island
 A:SP$ Attach | Cost$ U | ValidTgts$ Island | AILogic$ Pump
 A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 3 | Toughness$ 2 | Types$ Creature,Spirit | Colors$ Blue | Keywords$ Flying | SpellDescription$ Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land.
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Island is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
-SVar:TrigReturnOwner:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+T:Mode$ ChangesZone | ValidCard$ Card.EnchantedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Island is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
+SVar:TrigReturnOwner:DB$ ChangeZone | Hidden$ True | ChangeType$ Card.StrictlySelf | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Hand | Mandatory$ True
 SVar:NonStackingAttachEffect:True
 SVar:AIPaymentPreference:AvoidPayingWithAttachTarget
 Oracle:Enchant Island\n{2}: Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land.\nWhen enchanted Island is put into a graveyard, you may return Genju of the Falls from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/g/genju_of_the_fens.txt b/forge-gui/res/cardsfolder/g/genju_of_the_fens.txt
index b1c55c1da54..e1b671b8ede 100644
--- a/forge-gui/res/cardsfolder/g/genju_of_the_fens.txt
+++ b/forge-gui/res/cardsfolder/g/genju_of_the_fens.txt
@@ -4,9 +4,9 @@ Types:Enchantment Aura
 K:Enchant Swamp
 A:SP$ Attach | Cost$ B | ValidTgts$ Swamp | AILogic$ Pump
 A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 2 | Toughness$ 2 | Types$ Creature,Spirit | Colors$ Black | Abilities$ ABPump | SpellDescription$ Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with "{B}: This creature gets +1/+1 until end of turn." It's still a land.
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Swamp is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
+T:Mode$ ChangesZone | ValidCard$ Card.EnchantedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Swamp is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
 SVar:ABPump:AB$ Pump | Cost$ B | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ This creature gets +1/+1 until end of turn.
-SVar:TrigReturnOwner:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:TrigReturnOwner:DB$ ChangeZone | Hidden$ True | ChangeType$ Card.StrictlySelf | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Hand | Mandatory$ True
 SVar:NonStackingAttachEffect:True
 SVar:AIPaymentPreference:AvoidPayingWithAttachTarget
 Oracle:Enchant Swamp\n{2}: Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with "{B}: This creature gets +1/+1 until end of turn." It's still a land.\nWhen enchanted Swamp is put into a graveyard, you may return Genju of the Fens from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/g/genju_of_the_fields.txt b/forge-gui/res/cardsfolder/g/genju_of_the_fields.txt
index a5f0e89940f..82c0c121400 100644
--- a/forge-gui/res/cardsfolder/g/genju_of_the_fields.txt
+++ b/forge-gui/res/cardsfolder/g/genju_of_the_fields.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 K:Enchant Plains
 A:SP$ Attach | Cost$ W | ValidTgts$ Plains | AILogic$ Pump
 A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 2 | Toughness$ 5 | Types$ Creature,Spirit | Colors$ White | Triggers$ PseudoLifelink | SpellDescription$ Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with "Whenever this creature deals damage, its controller gains that much life." It's still a land.
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Plains is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
-SVar:TrigReturnOwner:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+T:Mode$ ChangesZone | ValidCard$ Card.EnchantedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Plains is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
+SVar:TrigReturnOwner:DB$ ChangeZone | Hidden$ True | ChangeType$ Card.StrictlySelf | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Hand | Mandatory$ True
 SVar:PseudoLifelink:Mode$ DamageDealtOnce | ValidSource$ Card.Self | Execute$ GenjuTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
 SVar:GenjuTrigGain:DB$ GainLife | Defined$ You | LifeAmount$ GenjuX
 SVar:NonStackingAttachEffect:True
diff --git a/forge-gui/res/cardsfolder/g/genju_of_the_realm.txt b/forge-gui/res/cardsfolder/g/genju_of_the_realm.txt
index 7bd2d45cfca..cebebf226b2 100644
--- a/forge-gui/res/cardsfolder/g/genju_of_the_realm.txt
+++ b/forge-gui/res/cardsfolder/g/genju_of_the_realm.txt
@@ -4,7 +4,7 @@ Types:Legendary Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ W U B R G | ValidTgts$ Land | AILogic$ Pump
 A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 8 | Toughness$ 12 | Types$ Creature,Legendary,Spirit | Keywords$ Trample | SpellDescription$ Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land.
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted land is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
-SVar:TrigReturnOwner:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+T:Mode$ ChangesZone | ValidCard$ Card.EnchantedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted land is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
+SVar:TrigReturnOwner:DB$ ChangeZone | Hidden$ True | ChangeType$ Card.StrictlySelf | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Hand | Mandatory$ True
 SVar:NonStackingAttachEffect:True
 Oracle:Enchant land\n{2}: Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land.\nWhen enchanted land is put into a graveyard, you may return Genju of the Realm from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/g/genju_of_the_spires.txt b/forge-gui/res/cardsfolder/g/genju_of_the_spires.txt
index ccfab5e9275..1eb4d3bcea3 100644
--- a/forge-gui/res/cardsfolder/g/genju_of_the_spires.txt
+++ b/forge-gui/res/cardsfolder/g/genju_of_the_spires.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 K:Enchant Mountain
 A:SP$ Attach | Cost$ R | ValidTgts$ Mountain | AILogic$ Pump
 A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 6 | Toughness$ 1 | Types$ Creature,Spirit | Colors$ Red | SpellDescription$ Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land.
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Mountain is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
-SVar:TrigReturnOwner:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+T:Mode$ ChangesZone | ValidCard$ Card.EnchantedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Mountain is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
+SVar:TrigReturnOwner:DB$ ChangeZone | Hidden$ True | ChangeType$ Card.StrictlySelf | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Hand | Mandatory$ True
 SVar:NonStackingAttachEffect:True
 SVar:AIPaymentPreference:AvoidPayingWithAttachTarget
 Oracle:Enchant Mountain\n{2}: Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land.\nWhen enchanted Mountain is put into a graveyard, you may return Genju of the Spires from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/g/gift_of_immortality.txt b/forge-gui/res/cardsfolder/g/gift_of_immortality.txt
index accc3f330e3..0e60e21be44 100644
--- a/forge-gui/res/cardsfolder/g/gift_of_immortality.txt
+++ b/forge-gui/res/cardsfolder/g/gift_of_immortality.txt
@@ -6,6 +6,6 @@ A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AITgts$ Creature.nonToken | AIL
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under its owner's control. Return CARDNAME to the battlefield attached to that creature at the beginning of the next end step.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredNewCardLKICopy | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBDelTrig
 SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield attached to that creature at the beginning of the next end step. | SubAbility$ DBCleanup | RememberObjects$ Remembered
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self | AttachedTo$ DelayTriggerRemembered
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self | AttachedTo$ DelayTriggerRememberedLKI
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Enchant creature\nWhen enchanted creature dies, return that card to the battlefield under its owner's control. Return Gift of Immortality to the battlefield attached to that creature at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/i/infectious_rage.txt b/forge-gui/res/cardsfolder/i/infectious_rage.txt
index 75d6982ba3f..b0034bc1ce7 100644
--- a/forge-gui/res/cardsfolder/i/infectious_rage.txt
+++ b/forge-gui/res/cardsfolder/i/infectious_rage.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ -1 | Description$ Enchanted creature gets +2/-1.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, choose a creature at random CARDNAME can enchant. Return CARDNAME to the battlefield attached to that creature.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, choose a creature at random CARDNAME can enchant. Return CARDNAME to the battlefield attached to that creature.
 SVar:TrigChangeZone:DB$ ChooseCard | AtRandom$ True | Choices$ Creature.CanBeEnchantedBy | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self | AttachedTo$ ChosenCard
 Oracle:Enchant creature\nEnchanted creature gets +2/-1.\nWhen enchanted creature dies, choose a creature at random Infectious Rage can enchant. Return Infectious Rage to the battlefield attached to that creature.
diff --git a/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt b/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt
index b97b088b692..77351fd6f6c 100644
--- a/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt
+++ b/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt
@@ -4,10 +4,8 @@ Types:Legendary Enchantment Aura
 K:Enchant creature you control
 A:SP$ Attach | Cost$ 1 B G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return it to the battlefield under your control, then return CARDNAME to the battlefield transformed under your control.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredNewCardLKICopy | GainControl$ True | SubAbility$ DBRemember
-SVar:DBRemember:DB$ Pump | RememberObjects$ Self | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Remembered | GainControl$ True | Transformed$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredNewCardLKICopy | GainControl$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self | GainControl$ True | Transformed$ True
 AlternateMode:DoubleFaced
 Oracle:Enchant creature you control\nWhen enchanted creature dies, return it to the battlefield under your control, then return Journey to Eternity to the battlefield transformed under your control.
 
diff --git a/forge-gui/res/cardsfolder/n/necrotic_plague.txt b/forge-gui/res/cardsfolder/n/necrotic_plague.txt
index 4d169dca574..0c0a47d3c63 100644
--- a/forge-gui/res/cardsfolder/n/necrotic_plague.txt
+++ b/forge-gui/res/cardsfolder/n/necrotic_plague.txt
@@ -6,7 +6,7 @@ A:SP$ Attach | Cost$ 2 B B | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ NecroticPlagueTrig | AddSVar$ NecroticPlagueSac | Description$ Enchanted creature has "At the beginning of your upkeep, sacrifice this creature."
 SVar:NecroticPlagueTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ NecroticPlagueSac | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME.
 SVar:NecroticPlagueSac:DB$ Sacrifice | SacValid$ Self
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChoose | TriggerDescription$ When enchanted creature dies, its controller chooses target creature one of their opponents controls. Return CARDNAME from its owner's graveyard to the battlefield attached to that creature.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChoose | TriggerDescription$ When enchanted creature dies, its controller chooses target creature one of their opponents controls. Return CARDNAME from its owner's graveyard to the battlefield attached to that creature.
 SVar:TrigChoose:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Choose a creature your opponents control | TargetsWithDefinedController$ TriggeredCardOpponent | IsCurse$ True | TargetingPlayer$ TriggeredCardController | SubAbility$ DBChange
 SVar:DBChange:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ ParentTarget
 SVar:NeedsToPlayVar:Z GE3
diff --git a/forge-gui/res/cardsfolder/n/next_of_kin.txt b/forge-gui/res/cardsfolder/n/next_of_kin.txt
index f42efbce34e..863c63cf59a 100644
--- a/forge-gui/res/cardsfolder/n/next_of_kin.txt
+++ b/forge-gui/res/cardsfolder/n/next_of_kin.txt
@@ -3,10 +3,10 @@ ManaCost:2 G
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When enchanted creature dies, you may put a creature card you own with lesser mana value from your hand or from the command zone onto the battlefield. If you do, return CARDNAME to the battlefield attached to that creature at the beginning of the next end step.
+T:Mode$ ChangesZone | ValidCard$ Card.EnchantedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When enchanted creature dies, you may put a creature card you own with lesser mana value from your hand or from the command zone onto the battlefield. If you do, return CARDNAME to the battlefield attached to that creature at the beginning of the next end step.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand,Command | Destination$ Battlefield | ChangeType$ Creature.cmcLTX+YouOwn | RememberChanged$ True | SubAbility$ DBDelayedTrigger
 SVar:X:TriggeredCard$CardManaCost
 SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ If you do, return CARDNAME to the battlefield attached to that creature at the beginning of the next end step.
-SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ DelayTriggerRemembered
+SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ DelayTriggerRememberedLKI
 DeckHas:Ability$Graveyard
 Oracle:Enchant creature\nWhen enchanted creature dies, you may put a creature card you own with lesser mana value from your hand or from the command zone onto the battlefield. If you do, return Next of Kin to the battlefield attached to that creature at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/p/puppet_master.txt b/forge-gui/res/cardsfolder/p/puppet_master.txt
index d90afd15eb7..5dafb68171c 100644
--- a/forge-gui/res/cardsfolder/p/puppet_master.txt
+++ b/forge-gui/res/cardsfolder/p/puppet_master.txt
@@ -3,8 +3,8 @@ ManaCost:U U U
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ U U U | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.EnchantedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return that card to its owner's hand. If that card is returned to its owner's hand this way, you may pay {U}{U}{U}. If you do, return CARDNAME to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return that card to its owner's hand. If that card is returned to its owner's hand this way, you may pay {U}{U}{U}. If you do, return CARDNAME to its owner's hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ TriggeredNewCardLKICopy | RememberChanged$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ CorrectedSelf | Origin$ Graveyard | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | ConditionCompare$ GE1 | UnlessCost$ U U U | UnlessPayer$ You | UnlessSwitched$ True
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | ConditionCompare$ GE1 | UnlessCost$ U U U | UnlessPayer$ You | UnlessSwitched$ True
 SVar:NonStackingAttachEffect:True
 Oracle:Enchant creature\nWhen enchanted creature dies, return that card to its owner's hand. If that card is returned to its owner's hand this way, you may pay {U}{U}{U}. If you do, return Puppet Master to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt b/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
index 2ad3fdbc075..dd976329523 100644
--- a/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
+++ b/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
@@ -4,9 +4,9 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddKeyword$ Vigilance | Description$ Enchanted creature gets +1/+0 and has vigilance.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigCurse | TriggerDescription$ When enchanted creature dies, return CARDNAME to the battlefield transformed under your control attached to target opponent.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigCurse | TriggerDescription$ When enchanted creature dies, return CARDNAME to the battlefield transformed under your control attached to target opponent.
 SVar:TrigCurse:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Choose an opponent | IsCurse$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ CorrectedSelf | Origin$ Graveyard | Destination$ Battlefield | AttachedToPlayer$ ParentTarget | Transformed$ True | GainControl$ True | AILogic$ Curse
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedToPlayer$ ParentTarget | Transformed$ True | GainControl$ True | AILogic$ Curse
 AlternateMode:DoubleFaced
 Oracle:Enchant creature\nEnchanted creature gets +1/+0 and has vigilance.\nWhen enchanted creature dies, return Radiant Grace to the battlefield transformed under your control attached to target opponent.
 
diff --git a/forge-gui/res/cardsfolder/s/screams_from_within.txt b/forge-gui/res/cardsfolder/s/screams_from_within.txt
index e1689c93bac..62c704dd392 100644
--- a/forge-gui/res/cardsfolder/s/screams_from_within.txt
+++ b/forge-gui/res/cardsfolder/s/screams_from_within.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 B B | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -1 | AddToughness$ -1 | Description$ Enchanted creature gets -1/-1.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return CARDNAME from your graveyard to the battlefield.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ CorrectedSelf
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return CARDNAME from your graveyard to the battlefield.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self
 Oracle:Enchant creature\nEnchanted creature gets -1/-1.\nWhen enchanted creature dies, return Screams from Within from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/skin_invasion_skin_shedder.txt b/forge-gui/res/cardsfolder/s/skin_invasion_skin_shedder.txt
index 2256a448bb5..42f88d7d2d4 100644
--- a/forge-gui/res/cardsfolder/s/skin_invasion_skin_shedder.txt
+++ b/forge-gui/res/cardsfolder/s/skin_invasion_skin_shedder.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ MustAttack | ValidCreature$ Creature.EnchantedBy | Description$ Enchanted creature attacks each combat if able.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return CARDNAME to the battlefield transformed under your control.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Transformed$ True | GainControl$ True | Defined$ CorrectedSelf
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return CARDNAME to the battlefield transformed under your control.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Transformed$ True | GainControl$ True | Defined$ Self
 AlternateMode:DoubleFaced
 Oracle:Enchant creature\nEnchanted creature attacks each combat if able.\nWhen enchanted creature dies, return Skin Invasion to the battlefield transformed under your control.
 
diff --git a/forge-gui/res/cardsfolder/upcoming/draconic_destiny.txt b/forge-gui/res/cardsfolder/upcoming/draconic_destiny.txt
index 018465f999d..1b3a8234310 100644
--- a/forge-gui/res/cardsfolder/upcoming/draconic_destiny.txt
+++ b/forge-gui/res/cardsfolder/upcoming/draconic_destiny.txt
@@ -5,8 +5,8 @@ K:Enchant creature
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying & Haste | AddType$ Dragon | Affected$ Creature.EnchantedBy | AddAbility$ Pump | Description$ Enchanted creature gets +1/+1 and has flying, haste, and "{1}: This creature gets +1/+0 until end of turn." It's a Dragon in addition to its other types.
 SVar:Pump:AB$ Pump | Defined$ Self | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return CARDNAME to its owner's hand.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ CorrectedSelf
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return CARDNAME to its owner's hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ Self
 DeckHas:Type$Dragon & Keyword$Flying|Haste
 DeckHints:Type$Dragon
 Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has flying, haste, and "{1}: This creature gets +1/+0 until end of turn." It's a Dragon in addition to its other types.\nWhen enchanted creature dies, return Draconic Destiny to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/nurgles_rot.txt b/forge-gui/res/cardsfolder/upcoming/nurgles_rot.txt
index d3eb9a2c419..335e754df49 100644
--- a/forge-gui/res/cardsfolder/upcoming/nurgles_rot.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nurgles_rot.txt
@@ -3,8 +3,8 @@ ManaCost:B
 Types:Enchantment Aura
 K:Enchant creature an opponent controls
 A:SP$ Attach | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return CARDNAME to its owner's hand and you create a 1/3 black Demon creature token named Plaguebearer of Nurgle.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ CorrectedSelf | SubAbility$ DBToken
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EnchantedBy | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, return CARDNAME to its owner's hand and you create a 1/3 black Demon creature token named Plaguebearer of Nurgle.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ Self | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ plaguebearer_of_nurgle
 DeckHas:Ability$Token & Type$Demon
 Oracle:Enchant creature an opponent controls\nWhen enchanted creature dies, return Nurgle's Rot to its owner's hand and you create a 1/3 black Demon creature token named Plaguebearer of Nurgle.