diff --git a/.gitattributes b/.gitattributes
index 3464da4b368..5ce0772084e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10587,6 +10587,7 @@ forge-gui/res/cardsfolder/n/nourish.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/n/nourishing_shoal.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/n/nova_chaser.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/n/nova_cleric.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/n/nova_pentacle.txt -text svneol=unset#text/plain
 forge-gui/res/cardsfolder/n/novablast_wurm.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/n/novijen_heart_of_progress.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/n/novijen_sages.txt -text
diff --git a/forge-gui/res/cardsfolder/c/carom.txt b/forge-gui/res/cardsfolder/c/carom.txt
index 8bb69743610..1dfddde83b5 100644
--- a/forge-gui/res/cardsfolder/c/carom.txt
+++ b/forge-gui/res/cardsfolder/c/carom.txt
@@ -3,8 +3,8 @@ ManaCost:1 W
 Types:Instant
 A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage to | ImprintTargets$ True | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead. Draw a card.
 SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage from | TargetUnique$ True | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | RememberObjects$ Targeted | ImprintCards$ Imprinted | SubAbility$ DBCleanup
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
+SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg  | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
+SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
diff --git a/forge-gui/res/cardsfolder/g/glarecaster.txt b/forge-gui/res/cardsfolder/g/glarecaster.txt
index a09380a58a0..ff59e4501d3 100644
--- a/forge-gui/res/cardsfolder/g/glarecaster.txt
+++ b/forge-gui/res/cardsfolder/g/glarecaster.txt
@@ -3,14 +3,18 @@ ManaCost:4 W W
 Types:Creature Bird Cleric
 PT:3/3
 K:Flying
-A:AB$ Effect | Cost$ 5 W | Name$ Glarecaster Effect | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect damamge | ReplacementEffects$ SelfCombat,SelfNonCombat | Triggers$ OutOfSight | SVars$ MirrorwoodDmgCombat,MirrorwoodDmgnonCombat,MirrorwoodX,ExileEffect | RememberObjects$ Targeted | ImprintCards$ Self | SpellDescription$ The next time damage would be dealt to CARDNAME and/or you this turn, that damage is dealt to target creature or player instead.
-SVar:SelfCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted,You | IsCombat$ True | ReplaceWith$ MirrorwoodDmgCombat | Description$ The next time damage would be dealt to this creature and/or you this turn, that damage is dealt to target creature or player instead.
-SVar:SelfNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted,You | IsCombat$ False | ReplaceWith$ MirrorwoodDmgnonCombat | Secondary$ True | Description$ The next time damage would be dealt to this creature and/or you this turn, that damage is dealt to target creature or player instead.
+A:AB$ Effect | Cost$ 5 W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect damamge | ReplacementEffects$ SelfCombat,SelfNonCombat | Triggers$ OutOfSight | SVars$ MirrorwoodDmgCombat,MirrorwoodDmgnonCombat,MirrorwoodX,ExileEffect,X,Y | RememberObjects$ Targeted | ImprintCards$ Self | SpellDescription$ The next time damage would be dealt to CARDNAME and/or you this turn, that damage is dealt to target creature or player instead.
+SVar:SelfCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted,You | IsCombat$ True | ReplaceWith$ MirrorwoodDmgCombat | CheckSVar$ X | Description$ The next time damage would be dealt to this creature and/or you this turn, that damage is dealt to target creature or player instead.
+SVar:SelfNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted,You | IsCombat$ False | ReplaceWith$ MirrorwoodDmgnonCombat | Secondary$ True | CheckSVar$ X | Description$ The next time damage would be dealt to this creature and/or you this turn, that damage is dealt to target creature or player instead.
 SVar:MirrorwoodDmgCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirrorwoodX | References$ MirrorwoodX | SubAbility$ ExileEffect
 SVar:MirrorwoodDmgnonCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ False | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirrorwoodX | References$ MirrorwoodX | SubAbility$ ExileEffect
 SVar:MirrorwoodX:ReplaceCount$DamageAmount
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsRemembered,Card.IsRemembered | Execute$ ExileEffect | Static$ True
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted,Card.IsRemembered | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+
+SVar:X:PlayerCountRemembered$Amount/Plus.Y
+SVar:Y:Count$Valid Creature.Remembered
+
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glarecaster.jpg
 Oracle:Flying\n{5}{W}: The next time damage would be dealt to Glarecaster and/or you this turn, that damage is dealt to target creature or player instead.
diff --git a/forge-gui/res/cardsfolder/k/karonas_zealot.txt b/forge-gui/res/cardsfolder/k/karonas_zealot.txt
index 1d5e24d9503..2c33c36e540 100644
--- a/forge-gui/res/cardsfolder/k/karonas_zealot.txt
+++ b/forge-gui/res/cardsfolder/k/karonas_zealot.txt
@@ -4,9 +4,9 @@ Types:Creature Human Cleric
 PT:2/5
 K:Morph:3 W W
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ KaronaEffect | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, all damage that would be dealt to it this turn is dealt to target creature instead.
-SVar:KaronaEffect:DB$ Effect | Name$ Karona's Zealot Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ ZealotCombat,ZealotNonCombat | Triggers$ OutOfSight | SVars$ ExileEffect,CombatDmg,NonCombatDmg,X | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted
-SVar:ZealotCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ All damage that would be dealt to Karona's Zealot this turn is dealt to target creature instead.
-SVar:ZealotNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ All damage that would be dealt to Karona's Zealot this turn is dealt to target creature instead.
+SVar:KaronaEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ ZealotCombat,ZealotNonCombat | Triggers$ OutOfSight | SVars$ ExileEffect,CombatDmg,NonCombatDmg,X | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted
+SVar:ZealotCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ All damage that would be dealt to Karona's Zealot this turn is dealt to target creature instead.
+SVar:ZealotNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ All damage that would be dealt to Karona's Zealot this turn is dealt to target creature instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | References$ X
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted | Execute$ ExileEffect | Static$ True
diff --git a/forge-gui/res/cardsfolder/k/kor_chant.txt b/forge-gui/res/cardsfolder/k/kor_chant.txt
index ff1c84c7b62..61c8d26c306 100644
--- a/forge-gui/res/cardsfolder/k/kor_chant.txt
+++ b/forge-gui/res/cardsfolder/k/kor_chant.txt
@@ -8,8 +8,8 @@ SVar:DBChooseSource:DB$ ChooseSource | Choices$ Card | SubAbility$ DBEffect
 
 SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ Combat,NonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | ImprintCards$ ParentTarget | RememberObjects$ ThisTargetedCard | SubAbility$ DBCleanup | ConditionDefined$ ParentTarget | ConditionPresent$ Card | ConditionCompare$ GE1
 
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
+SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
+SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted,Remembered | Execute$ ExileEffect | Static$ True
@@ -19,4 +19,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_chant.jpg
-Oracle:All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
\ No newline at end of file
+Oracle:All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
diff --git a/forge-gui/res/cardsfolder/k/kor_dirge.txt b/forge-gui/res/cardsfolder/k/kor_dirge.txt
index aef83d92996..e86a5e8dd7e 100644
--- a/forge-gui/res/cardsfolder/k/kor_dirge.txt
+++ b/forge-gui/res/cardsfolder/k/kor_dirge.txt
@@ -8,8 +8,8 @@ SVar:DBChooseSource:DB$ ChooseSource | Choices$ Card | SubAbility$ DBEffect
 
 SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ Combat,NonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | ImprintCards$ ParentTarget | RememberObjects$ ThisTargetedCard | SubAbility$ DBCleanup | ConditionDefined$ ParentTarget | ConditionPresent$ Card | ConditionCompare$ GE1
 
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
+SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
+SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted,Remembered | Execute$ ExileEffect | Static$ True
@@ -19,4 +19,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_dirge.jpg
-Oracle:All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
\ No newline at end of file
+Oracle:All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
diff --git a/forge-gui/res/cardsfolder/l/lancers_en_kor.txt b/forge-gui/res/cardsfolder/l/lancers_en_kor.txt
index 873549d62ef..b4d8a3de1dc 100644
--- a/forge-gui/res/cardsfolder/l/lancers_en_kor.txt
+++ b/forge-gui/res/cardsfolder/l/lancers_en_kor.txt
@@ -4,8 +4,8 @@ Types:Creature Kor Soldier
 PT:3/3
 K:Trample
 A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | References$ Y
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | References$ Y
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect | References$ X
diff --git a/forge-gui/res/cardsfolder/m/mirrorwood_treefolk.txt b/forge-gui/res/cardsfolder/m/mirrorwood_treefolk.txt
index ef22012c53a..5eb251cc86b 100644
--- a/forge-gui/res/cardsfolder/m/mirrorwood_treefolk.txt
+++ b/forge-gui/res/cardsfolder/m/mirrorwood_treefolk.txt
@@ -2,14 +2,18 @@ Name:Mirrorwood Treefolk
 ManaCost:3 G
 Types:Creature Treefolk
 PT:2/4
-A:AB$ Effect | Cost$ 2 R W | Name$ Mirrorwood Treefolk Effect | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect damamge | ReplacementEffects$ SelfCombat,SelfNonCombat | Triggers$ OutOfSight | SVars$ MirrorwoodDmgCombat,MirrorwoodDmgnonCombat,MirrorwoodX,ExileEffect | RememberObjects$ Targeted | ImprintCards$ Self | SpellDescription$ The next time damage would be dealt to CARDNAME this turn, that damage is dealt to target creature or player instead.
-SVar:SelfCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ MirrorwoodDmgCombat | Description$ The next time damage would be dealt to this creature this turn, that damage is dealt to target creature or player instead.
-SVar:SelfNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ MirrorwoodDmgnonCombat | Secondary$ True | Description$ The next time damage would be dealt to this creature this turn, that damage is dealt to target creature or player instead.
+A:AB$ Effect | Cost$ 2 R W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect damamge | ReplacementEffects$ SelfCombat,SelfNonCombat | Triggers$ OutOfSight | SVars$ MirrorwoodDmgCombat,MirrorwoodDmgnonCombat,MirrorwoodX,ExileEffect,X,Y | RememberObjects$ Targeted | ImprintCards$ Self | SpellDescription$ The next time damage would be dealt to CARDNAME this turn, that damage is dealt to target creature or player instead.
+SVar:SelfCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ MirrorwoodDmgCombat | CheckSVar$ X | Description$ The next time damage would be dealt to this creature this turn, that damage is dealt to target creature or player instead.
+SVar:SelfNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ MirrorwoodDmgnonCombat | Secondary$ True | CheckSVar$ X | Description$ The next time damage would be dealt to this creature this turn, that damage is dealt to target creature or player instead.
 SVar:MirrorwoodDmgCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirrorwoodX | References$ MirrorwoodX | SubAbility$ ExileEffect
 SVar:MirrorwoodDmgnonCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ False | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirrorwoodX | References$ MirrorwoodX | SubAbility$ ExileEffect
 SVar:MirrorwoodX:ReplaceCount$DamageAmount
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsRemembered,Card.IsRemembered | Execute$ ExileEffect | Static$ True
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted,Card.IsRemembered | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+
+SVar:X:PlayerCountRemembered$Amount/Plus.Y
+SVar:Y:Count$Valid Creature.Remembered
+
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mirrorwood_treefolk.jpg
 Oracle:{2}{R}{W}: The next time damage would be dealt to Mirrorwood Treefolk this turn, that damage is dealt to target creature or player instead.
diff --git a/forge-gui/res/cardsfolder/n/nomads_en_kor.txt b/forge-gui/res/cardsfolder/n/nomads_en_kor.txt
index 6ca6582eb3a..dafca156904 100644
--- a/forge-gui/res/cardsfolder/n/nomads_en_kor.txt
+++ b/forge-gui/res/cardsfolder/n/nomads_en_kor.txt
@@ -3,8 +3,8 @@ ManaCost:W
 Types:Creature Kor Nomad Soldier
 PT:1/1
 A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
diff --git a/forge-gui/res/cardsfolder/n/nova_pentacle.txt b/forge-gui/res/cardsfolder/n/nova_pentacle.txt
new file mode 100644
index 00000000000..7b1064c2ed4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/n/nova_pentacle.txt
@@ -0,0 +1,24 @@
+Name:Nova Pentacle
+ManaCost: 4
+Types:Artifact
+A:AB$ ChooseSource | Cost$ 3 T | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a black source of your choice would deal damage to you this turn, prevent that damage.
+
+SVar:DBEffect:DB$ Effect | TargetingPlayer$ Player.Opponent | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature the caster of this spell don't control | ReplacementEffects$ SelflessCombat,SelflessNonCombat | SVars$ SelflessCombat,SelflessNonCombat,ExileEffect,OutOfSight,X | RememberObjects$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+
+SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsRemembered | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature of an opponent's choice instead.
+
+SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature of an opponent's choice instead.
+
+SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
+SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
+
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Remembered | Execute$ ExileEffect | Static$ True
+
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+SVar:X:ReplaceCount$DamageAmount
+
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nova_pentacle.jpg
+Oracle:{3}, {T}: The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature of an opponent's choice instead.
diff --git a/forge-gui/res/cardsfolder/o/outrider_en_kor.txt b/forge-gui/res/cardsfolder/o/outrider_en_kor.txt
index 1edc8cc91e0..1fdb3e7a7dc 100644
--- a/forge-gui/res/cardsfolder/o/outrider_en_kor.txt
+++ b/forge-gui/res/cardsfolder/o/outrider_en_kor.txt
@@ -4,8 +4,8 @@ Types:Creature Kor Rebel Knight
 PT:2/2
 K:Flanking
 A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
diff --git a/forge-gui/res/cardsfolder/s/shaman_en_kor.txt b/forge-gui/res/cardsfolder/s/shaman_en_kor.txt
index f9cd6b6b29c..6f719026b21 100644
--- a/forge-gui/res/cardsfolder/s/shaman_en_kor.txt
+++ b/forge-gui/res/cardsfolder/s/shaman_en_kor.txt
@@ -3,24 +3,32 @@ ManaCost:1 W
 Types:Creature Kor Cleric Shaman
 PT:1/2
 A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead.
+
+SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead.
+
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
 SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
+
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
+
 SVar:X:ReplaceCount$DamageAmount/Minus.1
 SVar:Y:ReplaceCount$DamageAmount
-A:AB$ ChooseSource | Cost$ 1 W | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to CARDNAME instead.
-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight2 | SVars$ ShamanCombatDmg,ShamanNonCombatDmg,ExileEffect,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight2,ShamanCombatDmg,ShamanNonCombatDmg,ExileEffect,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Remembered | ImprintCards$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ ShamanCombatDmg | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ ShamanNonCombatDmg | Secondary$ True | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead.
+
+A:AB$ ChooseSource | Cost$ 1 W | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to CARDNAME instead.
+
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ ShamanCombatDmg,ShamanNonCombatDmg,ExileEffect,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight,ShamanCombatDmg,ShamanNonCombatDmg,ExileEffect,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+
+SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ ShamanCombatDmg | IsPresent$ Creature.IsRemembered | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead.
+SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ ShamanNonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead.
+
 SVar:ShamanCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ Y | SubAbility$ ExileEffect
 SVar:ShamanNonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | NumDmg$ Y | SubAbility$ ExileEffect
-SVar:OutOfSight2:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted | Execute$ ExileEffect | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shaman_en_kor.jpg
 Oracle:{0}: The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead.\n{1}{W}: The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead.
diff --git a/forge-gui/res/cardsfolder/s/spirit_en_kor.txt b/forge-gui/res/cardsfolder/s/spirit_en_kor.txt
index 9231085c1cc..a9416ab74b6 100644
--- a/forge-gui/res/cardsfolder/s/spirit_en_kor.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_en_kor.txt
@@ -4,8 +4,8 @@ Types:Creature Kor Spirit
 PT:2/2
 K:Flying
 A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg  | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
diff --git a/forge-gui/res/cardsfolder/w/ward_of_piety.txt b/forge-gui/res/cardsfolder/w/ward_of_piety.txt
index c6b23ce93ab..4a3ae6e58de 100644
--- a/forge-gui/res/cardsfolder/w/ward_of_piety.txt
+++ b/forge-gui/res/cardsfolder/w/ward_of_piety.txt
@@ -3,9 +3,9 @@ ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
-A:AB$ Effect | Cost$ 1 W | Name$ Redirection Ward | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ PietyCombat,PietyNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ PietyCombat,PietyNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | ImprintCards$ Enchanted | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
-SVar:PietyCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
-SVar:PietyNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
+A:AB$ Effect | Cost$ 1 W | Name$ Redirection Ward | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ PietyCombat,PietyNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y,RCP,RCC | References$ PietyCombat,PietyNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y,RCP,RCC | Duration$ HostLeavesOrEOT | ImprintCards$ Enchanted | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
+SVar:PietyCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg  | CheckSVar$ RCP | Description$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
+SVar:PietyNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | CheckSVar$ RCP | Description$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
@@ -14,6 +14,10 @@ SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Def
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:X:ReplaceCount$DamageAmount/Minus.1
 SVar:Y:ReplaceCount$DamageAmount
-SVar:RemAIDeck:TrueSVar:Rarity:Uncommon
+
+SVar:RCP:PlayerCountRemembered$Amount/Plus.RCC
+SVar:RCC:Count$Valid Creature.Remembered
+
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ward_of_piety.jpg
 Oracle:Enchant creature\n{1}{W}: The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
diff --git a/forge-gui/res/cardsfolder/w/warrior_en_kor.txt b/forge-gui/res/cardsfolder/w/warrior_en_kor.txt
index fde4185c413..1382af63365 100644
--- a/forge-gui/res/cardsfolder/w/warrior_en_kor.txt
+++ b/forge-gui/res/cardsfolder/w/warrior_en_kor.txt
@@ -3,8 +3,8 @@ ManaCost:W W
 Types:Creature Kor Warrior Knight
 PT:2/2
 A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead.
+SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
diff --git a/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt b/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt
index d79fbcc2dd8..54e4f7f1e9b 100644
--- a/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt
+++ b/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt
@@ -2,9 +2,9 @@ Name:Zealous Inquisitor
 ManaCost:2 W
 Types:Creature Human Cleric
 PT:2/2
-A:AB$ Effect | Cost$ 1 W | Name$ Inquisitor Redirection | ValidTgts$ Creature | TgtPrompt$ Select target creature  to redirect the damage to | ReplacementEffects$ InquisitorCombat,InquisitorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ InquisitorCombat,InquisitorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | ImprintCards$ Self | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature instead.
-SVar:InquisitorCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
-SVar:InquisitorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
+A:AB$ Effect | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ InquisitorCombat,InquisitorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ InquisitorCombat,InquisitorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | ImprintCards$ Self | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature instead.
+SVar:InquisitorCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsRemembered | Description$ The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
+SVar:InquisitorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
diff --git a/forge-gui/res/cardsfolder/z/zhalfirin_crusader.txt b/forge-gui/res/cardsfolder/z/zhalfirin_crusader.txt
index d6f14efa28c..90530615b65 100644
--- a/forge-gui/res/cardsfolder/z/zhalfirin_crusader.txt
+++ b/forge-gui/res/cardsfolder/z/zhalfirin_crusader.txt
@@ -3,9 +3,9 @@ ManaCost:1 W W
 Types:Creature Human Knight
 PT:2/2
 K:Flanking
-A:AB$ Effect | Cost$ 1 W | Name$ Zhalfirin Redirection | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ CrusaderCombat,CrusaderNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ CrusaderCombat,CrusaderNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | ImprintCards$ Self | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature or player instead.
-SVar:CrusaderCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead.
-SVar:CrusaderNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead.
+A:AB$ Effect | Cost$ 1 W | Name$ Zhalfirin Redirection | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ CrusaderCombat,CrusaderNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y,RCP,RCC | References$ CrusaderCombat,CrusaderNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y,RCP,RCC | Duration$ HostLeavesOrEOT | ImprintCards$ Self | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature or player instead.
+SVar:CrusaderCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg | CheckSVar$ RCP | Description$ The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead.
+SVar:CrusaderNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | CheckSVar$ RCP | Description$ The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
 SVar:RestDmgCombat:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
@@ -14,6 +14,10 @@ SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Def
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:X:ReplaceCount$DamageAmount/Minus.1
 SVar:Y:ReplaceCount$DamageAmount
+
+SVar:RCP:PlayerCountRemembered$Amount/Plus.RCC
+SVar:RCC:Count$Valid Creature.Remembered
+
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zhalfirin_crusader.jpg
 Oracle:Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)\n{1}{W}: The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead.