diff --git a/forge-gui/res/cardsfolder/a/aggressive_instinct.txt b/forge-gui/res/cardsfolder/a/aggressive_instinct.txt
index 1320fd273c5..ad943f9a605 100644
--- a/forge-gui/res/cardsfolder/a/aggressive_instinct.txt
+++ b/forge-gui/res/cardsfolder/a/aggressive_instinct.txt
@@ -2,6 +2,6 @@ Name:Aggressive Instinct
 ManaCost:1 G
 Types:Sorcery
 A:SP$ Pump | Cost$ 1 G | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 Oracle:Target creature you control deals damage equal to its power to target creature you don't control.
diff --git a/forge-gui/res/cardsfolder/a/ambuscade.txt b/forge-gui/res/cardsfolder/a/ambuscade.txt
index a81da7a413d..daaf01c57ea 100644
--- a/forge-gui/res/cardsfolder/a/ambuscade.txt
+++ b/forge-gui/res/cardsfolder/a/ambuscade.txt
@@ -2,7 +2,7 @@ Name:Ambuscade
 ManaCost:2 G
 Types:Instant
 A:SP$ Pump | Cost$ 2 G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +1 | SubAbility$ DBDealDamage | AILogic$ Fight | SpellDescription$ Target creature you control gets +1/+0 until end of turn. It deals damage equal to its power to target creature an opponent controls.
-SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature an opponent controls | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature an opponent controls | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ambuscade.jpg
-Oracle:Target creature you control gets +1/+0 until end of turn. It deals damage equal to its power to target creature an opponent controls.
\ No newline at end of file
+Oracle:Target creature you control gets +1/+0 until end of turn. It deals damage equal to its power to target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/c/clear_shot.txt b/forge-gui/res/cardsfolder/c/clear_shot.txt
index d133e2a3c78..6add62135c2 100644
--- a/forge-gui/res/cardsfolder/c/clear_shot.txt
+++ b/forge-gui/res/cardsfolder/c/clear_shot.txt
@@ -2,7 +2,7 @@ Name:Clear Shot
 ManaCost:2 G
 Types:Instant
 A:SP$ Pump | Cost$ 2 G | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | NumAtt$ +1 | NumDef$ +1 | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control gets +1/+1 until end of turn. It deals damage equal to its power to target creature you don't control.
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clear_shot.jpg
 Oracle:Target creature you control gets +1/+1 until end of turn. It deals damage equal to its power to target creature you don't control.
diff --git a/forge-gui/res/cardsfolder/n/natures_way.txt b/forge-gui/res/cardsfolder/n/natures_way.txt
index f117c3130f6..4853ce3b1b6 100644
--- a/forge-gui/res/cardsfolder/n/natures_way.txt
+++ b/forge-gui/res/cardsfolder/n/natures_way.txt
@@ -2,7 +2,7 @@ Name:Nature's Way
 ManaCost:1 G
 Types:Sorcery
 A:SP$ Pump | Cost$ 1 G | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | KW$ Vigilance & Trample | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control gains vigilance and trample until end of turn. It deals damage equal to its power to target creature you don't control.
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_way.jpg
 Oracle:Target creature you control gains vigilance and trample until end of turn. It deals damage equal to its power to target creature you don't control.
diff --git a/forge-gui/res/cardsfolder/r/rabid_bite.txt b/forge-gui/res/cardsfolder/r/rabid_bite.txt
index b12ff224209..7ee4a3727bf 100644
--- a/forge-gui/res/cardsfolder/r/rabid_bite.txt
+++ b/forge-gui/res/cardsfolder/r/rabid_bite.txt
@@ -2,7 +2,7 @@ Name:Rabid Bite
 ManaCost:1 G
 Types:Sorcery
 A:SP$ Pump | Cost$ 1 G | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rabid_bite.jpg
 Oracle:Target creature you control deals damage equal to its power to target creature you don't control. 
diff --git a/forge-gui/res/cardsfolder/r/ram_through.txt b/forge-gui/res/cardsfolder/r/ram_through.txt
index af7155ee67c..7f819088274 100644
--- a/forge-gui/res/cardsfolder/r/ram_through.txt
+++ b/forge-gui/res/cardsfolder/r/ram_through.txt
@@ -2,6 +2,6 @@ Name:Ram Through
 ManaCost:1 G
 Types:Instant
 A:SP$ Pump | Cost$ 1 G | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ SpellDescription | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control. If the creature you control has trample, excess damage is dealt to that creature's controller instead.
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget | ExcessDamage$ TargetedController | ExcessDamageCondition$ Card.withTrample | StackDescription$ None
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget | ExcessDamage$ TargetedController | ExcessDamageCondition$ Card.withTrample | StackDescription$ None
 SVar:X:ParentTargeted$CardPower
 Oracle:Target creature you control deals damage equal to its power to target creature you don't control. If the creature you control has trample, excess damage is dealt to that creature's controller instead.
diff --git a/forge-gui/res/cardsfolder/s/souls_fire.txt b/forge-gui/res/cardsfolder/s/souls_fire.txt
index 02dc64c8e6b..11459e57b1a 100644
--- a/forge-gui/res/cardsfolder/s/souls_fire.txt
+++ b/forge-gui/res/cardsfolder/s/souls_fire.txt
@@ -2,7 +2,7 @@ Name:Soul's Fire
 ManaCost:2 R
 Types:Instant
 A:SP$ Pump | Cost$ 2 R | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to any target.
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | AILogic$ PowerDmg | TgtPrompt$ Select any target | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | AILogic$ PowerDmg | TgtPrompt$ Select any target | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/souls_fire.jpg
 Oracle:Target creature you control deals damage equal to its power to any target.
diff --git a/forge-gui/res/cardsfolder/s/spirit_flare.txt b/forge-gui/res/cardsfolder/s/spirit_flare.txt
index 10d62fba2fc..ced3bf37798 100644
--- a/forge-gui/res/cardsfolder/s/spirit_flare.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_flare.txt
@@ -2,10 +2,8 @@ Name:Spirit Flare
 ManaCost:3 W
 Types:Instant
 K:Flashback:1 W PayLife<3>
-A:SP$ Tap | Cost$ 3 W | TgtPrompt$ Select target untapped creature you control | ValidTgts$ Creature.untapped+YouCtrl | SubAbility$ SpiritDmg | RememberTapped$ True | SpellDescription$ Tap target untapped creature you control. If you do, it deals damage equal to its power to target attacking or blocking creature an opponent controls.
-SVar:SpiritDmg:DB$ DealDamage | ValidTgts$ Creature.attacking+OppCtrl,Creature.blocking+OppCtrl | TgtPrompt$ Select target attacking or blocking creature an opponent controls | NumDmg$ SpiritStrength | ConditionCheckSVar$ WasTapped | ConditionSVarCompare$ GE1
-SVar:SpiritStrength:Remembered$CardPower
-SVar:WasTapped:Remembered$Amount
-AI:RemoveDeck:All
+A:SP$ Tap | Cost$ 3 W | TgtPrompt$ Select target untapped creature you control | ValidTgts$ Creature.untapped+YouCtrl | SubAbility$ SpiritDmg | SpellDescription$ Tap target untapped creature you control. If you do, it deals damage equal to its power to target attacking or blocking creature an opponent controls.
+SVar:SpiritDmg:DB$ DealDamage | ValidTgts$ Creature.attacking+OppCtrl,Creature.blocking+OppCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target attacking or blocking creature an opponent controls | NumDmg$ X | DamageSource$ ParentTarget
+SVar:X:ParentTargeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_flare.jpg
 Oracle:Tap target untapped creature you control. If you do, it deals damage equal to its power to target attacking or blocking creature an opponent controls.\nFlashback—{1}{W}, Pay 3 life. (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/t/tail_slash.txt b/forge-gui/res/cardsfolder/t/tail_slash.txt
index 849754a6cbd..ff44b39b644 100644
--- a/forge-gui/res/cardsfolder/t/tail_slash.txt
+++ b/forge-gui/res/cardsfolder/t/tail_slash.txt
@@ -2,7 +2,7 @@ Name:Tail Slash
 ManaCost:2 R
 Types:Instant
 A:SP$ Pump | Cost$ 2 R | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ TailDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control.
-SVar:TailDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:TailDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tail_strike.jpg
 Oracle:Target creature you control deals damage equal to its power to target creature you don't control.
diff --git a/forge-gui/res/cardsfolder/t/thrash_threat.txt b/forge-gui/res/cardsfolder/t/thrash_threat.txt
index be712640725..f5023e26b47 100644
--- a/forge-gui/res/cardsfolder/t/thrash_threat.txt
+++ b/forge-gui/res/cardsfolder/t/thrash_threat.txt
@@ -3,7 +3,7 @@ ManaCost:R/G R/G
 AlternateMode: Split
 Types:Instant
 A:SP$ Pump | Cost$ RG RG | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature or planeswalker you don't control | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature or planeswalker you don't control | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 Oracle:Target creature you control deals damage equal to its power to target creature or planeswalker you don't control.
 
diff --git a/forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt b/forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt
index 5bf545b72ef..f80b214dbbd 100644
--- a/forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt
+++ b/forge-gui/res/cardsfolder/v/vivien_of_the_arkbow.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G
 Types:Legendary Planeswalker Vivien
 A:AB$ PutCounter | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | CounterNum$ 2 | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | AIActivateLast$ True | SpellDescription$ Put two +1/+1 counters on up to one target creature.
 A:AB$ Pump | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ TailDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control.
-SVar:TailDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget
+SVar:TailDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
 A:AB$ PumpAll | Cost$ SubCounter<9/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +4 | NumDef$ +4 | KW$ Trample | SpellDescription$ Creatures you control get +4/+4 and gain trample until end of turn.
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/w/wing_puncture.txt b/forge-gui/res/cardsfolder/w/wing_puncture.txt
index 5fdef5e2fdc..5e128890634 100644
--- a/forge-gui/res/cardsfolder/w/wing_puncture.txt
+++ b/forge-gui/res/cardsfolder/w/wing_puncture.txt
@@ -2,9 +2,7 @@ Name:Wing Puncture
 ManaCost:G
 Types:Instant
 A:SP$ Pump | Cost$ G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | RememberObjects$ Targeted | SpellDescription$ Target creature you control deals damage equal to its power to target creature with flying.
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ X | DamageSource$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$CardPower
-AI:RemoveDeck:All
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.withFlying | AILogic$ PowerDmg  | TgtPrompt$ Select target creature with flying | NumDmg$ X |  DamageSource$ ParentTarget
+SVar:X:ParentTargeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wing_puncture.jpg
 Oracle:Target creature you control deals damage equal to its power to target creature with flying.