diff --git a/res/cardsfolder/a/apprentice_necromancer.txt b/res/cardsfolder/a/apprentice_necromancer.txt
index a79d2d9f168..9ca9ce95d30 100644
--- a/res/cardsfolder/a/apprentice_necromancer.txt
+++ b/res/cardsfolder/a/apprentice_necromancer.txt
@@ -3,8 +3,7 @@ ManaCost:1 B
 Types:Creature Zombie Wizard
 PT:1/1
 A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
-SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Targeted | Permanent$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Targeted | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME.
+SVar:DBPump:DB$ Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Targeted | Permanent$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apprentice_necromancer.jpg
 Oracle:{B}, {T}, Sacrifice Apprentice Necromancer: Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
\ No newline at end of file
diff --git a/res/cardsfolder/b/brackwater_elemental.txt b/res/cardsfolder/b/brackwater_elemental.txt
index 7bb67f61511..fb11c70f9d8 100644
--- a/res/cardsfolder/b/brackwater_elemental.txt
+++ b/res/cardsfolder/b/brackwater_elemental.txt
@@ -5,6 +5,6 @@ PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME attacks or blocks, sacrifice it at the beginning of the next end step.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, sacrifice it at the beginning of the next end step.
 K:Unearth:2 U
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brackwater_elemental.jpg
 Oracle:When Brackwater Elemental attacks or blocks, sacrifice it at the beginning of the next end step.\nUnearth {2}{U} ({2}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
\ No newline at end of file
diff --git a/res/cardsfolder/c/celestial_sword.txt b/res/cardsfolder/c/celestial_sword.txt
index e76337750a9..ac065d1727b 100644
--- a/res/cardsfolder/c/celestial_sword.txt
+++ b/res/cardsfolder/c/celestial_sword.txt
@@ -1,7 +1,8 @@
 Name:Celestial Sword
 ManaCost:6
 Types:Artifact
-A:AB$ Pump | Cost$ 3 T | NumAtt$ +3 | NumDef$ +3 | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Target creature you control gets +3/+3 until end of turn. Its controller sacrifices it at the beginning of the next end step.
+A:AB$ Pump | Cost$ 3 T | NumAtt$ +3 | NumDef$ +3 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBPump | SpellDescription$ Target creature you control gets +3/+3 until end of turn. Its controller sacrifices it at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/celestial_sword.jpg
 Oracle:{3}, {T}: Target creature you control gets +3/+3 until end of turn. Its controller sacrifices it at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/c/chimeric_coils.txt b/res/cardsfolder/c/chimeric_coils.txt
index d3dfa44566d..a0b8d7ad0b9 100644
--- a/res/cardsfolder/c/chimeric_coils.txt
+++ b/res/cardsfolder/c/chimeric_coils.txt
@@ -1,7 +1,7 @@
 Name:Chimeric Coils
 ManaCost:1
 Types:Artifact
-A:AB$ Animate | Cost$ X 1 | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | Keywords$ At the beginning of the end step, sacrifice CARDNAME. | References$ X | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.
+A:AB$ Animate | Cost$ X 1 | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | Keywords$ At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True | References$ X | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chimeric_coils.jpg
diff --git a/res/cardsfolder/d/deathknell_kami.txt b/res/cardsfolder/d/deathknell_kami.txt
index d0c28c2f622..ce636648d57 100644
--- a/res/cardsfolder/d/deathknell_kami.txt
+++ b/res/cardsfolder/d/deathknell_kami.txt
@@ -3,7 +3,8 @@ ManaCost:1 B
 Types:Creature Spirit
 PT:0/1
 K:Flying
-A:AB$ Pump | Cost$ 2 | NumAtt$ +1 | NumDef$ +1 | KW$ At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ CARDNAME gets +1/+1 until end of turn. Sacrifice it at the beginning of the next end step.
+A:AB$ Pump | Cost$ 2 | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBPump | SpellDescription$ CARDNAME gets +1/+1 until end of turn. Sacrifice it at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 K:Soulshift 1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathknell_kami.jpg
diff --git a/res/cardsfolder/f/fatal_frenzy.txt b/res/cardsfolder/f/fatal_frenzy.txt
index 649a91e67aa..1b6e74d3bd7 100644
--- a/res/cardsfolder/f/fatal_frenzy.txt
+++ b/res/cardsfolder/f/fatal_frenzy.txt
@@ -1,7 +1,8 @@
 Name:Fatal Frenzy
 ManaCost:2 R
 Types:Instant
-A:SP$ Pump | Cost$ 2 R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ Trample & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | References$ X | SpellDescription$ Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
+A:SP$ Pump | Cost$ 2 R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ Trample | References$ X | SubAbility$ DBPump | SpellDescription$ Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:X:Targeted$CardPower
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fatal_frenzy.jpg
diff --git a/res/cardsfolder/f/footsteps_of_the_goryo.txt b/res/cardsfolder/f/footsteps_of_the_goryo.txt
index 37ec2092e7d..3e3e0c6eb35 100644
--- a/res/cardsfolder/f/footsteps_of_the_goryo.txt
+++ b/res/cardsfolder/f/footsteps_of_the_goryo.txt
@@ -2,7 +2,7 @@ Name:Footsteps of the Goryo
 ManaCost:2 B
 Types:Sorcery Arcane
 A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
-SVar:DBPump:DB$Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Targeted
+SVar:DBPump:DB$Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Targeted | Permanent$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/footsteps_of_the_goryo.jpg
 Oracle:Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/g/goblin_ski_patrol.txt b/res/cardsfolder/g/goblin_ski_patrol.txt
index 5fef2242585..ebc1ec9e8e0 100644
--- a/res/cardsfolder/g/goblin_ski_patrol.txt
+++ b/res/cardsfolder/g/goblin_ski_patrol.txt
@@ -2,7 +2,7 @@ Name:Goblin Ski Patrol
 ManaCost:1 R
 Types:Creature Goblin
 PT:1/1
-A:AB$ Pump | Cost$ 1 R | NumAtt$ +2 | KW$ Flying & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | ActivationLimit$ 1 | IsPresent$ Mountain.Snow+YouCtrl | SpellDescription$ CARDNAME gets +2/+0 and gains flying. Its controller sacrifices it at the beginning of the next end step. Activate this ability only once and only if you control a snow Mountain.
+A:AB$ Pump | Cost$ 1 R | NumAtt$ +2 | KW$ Flying & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True | ActivationLimit$ 1 | IsPresent$ Mountain.Snow+YouCtrl | SpellDescription$ CARDNAME gets +2/+0 and gains flying. Its controller sacrifices it at the beginning of the next end step. Activate this ability only once and only if you control a snow Mountain.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_ski_patrol.jpg
 Oracle:{1}{R}: Goblin Ski Patrol gets +2/+0 and gains flying. Its controller sacrifices it at the beginning of the next end step. Activate this ability only once and only if you control a snow Mountain.
\ No newline at end of file
diff --git a/res/cardsfolder/i/impromptu_raid.txt b/res/cardsfolder/i/impromptu_raid.txt
index 4f48b620a72..32fad8f0710 100644
--- a/res/cardsfolder/i/impromptu_raid.txt
+++ b/res/cardsfolder/i/impromptu_raid.txt
@@ -2,8 +2,7 @@ Name:Impromptu Raid
 ManaCost:3 RG
 Types:Enchantment
 A:AB$ Dig | Cost$ 2 RG | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Creature | DestinationZone$ Battlefield | DestinationZone2$ Graveyard | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Reveal the top card of your library. If it isn't a creature card, put it into your graveyard. Otherwise, put that card onto the battlefield. That creature gains haste. Sacrifice it at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | Permanent$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/impromptu_raid.jpg
 Oracle:{2}{R/G}: Reveal the top card of your library. If it isn't a creature card, put it into your graveyard. Otherwise, put that card onto the battlefield. That creature gains haste. Sacrifice it at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/i/incandescent_soulstoke.txt b/res/cardsfolder/i/incandescent_soulstoke.txt
index 3a712aafce3..0d2fbdc6fe5 100644
--- a/res/cardsfolder/i/incandescent_soulstoke.txt
+++ b/res/cardsfolder/i/incandescent_soulstoke.txt
@@ -4,8 +4,8 @@ Types:Creature Elemental Shaman
 PT:2/2
 S:Mode$ Continuous | Affected$ Creature.Elemental+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Elemental creatures you control get +1/+1.
 A:AB$ ChangeZone | Cost$ 1 R T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Elemental+YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ You may put an Elemental creature card from your hand onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | Permanent$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | SubAbility$ DBPump2
+SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:PlayMain1:TRUE
diff --git a/res/cardsfolder/j/junkyo_bell.txt b/res/cardsfolder/j/junkyo_bell.txt
index 2340374947f..0091ebd264e 100644
--- a/res/cardsfolder/j/junkyo_bell.txt
+++ b/res/cardsfolder/j/junkyo_bell.txt
@@ -2,7 +2,8 @@ Name:Junkyo Bell
 ManaCost:4
 Types:Artifact
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may have target creature you control get +X/+X until end of turn, where X is the number of creatures you control. If you do, sacrifice that creature at the beginning of the next end step.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | NumDef$ +X | KW$ At the beginning of the end step, sacrifice CARDNAME. | References$ X
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | NumDef$ +X | References$ X | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/junkyo_bell.jpg
diff --git a/res/cardsfolder/k/killer_instinct.txt b/res/cardsfolder/k/killer_instinct.txt
index 963072180a3..afdd05c71ad 100644
--- a/res/cardsfolder/k/killer_instinct.txt
+++ b/res/cardsfolder/k/killer_instinct.txt
@@ -3,8 +3,8 @@ ManaCost:4 R G
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ At the beginning of your upkeep, reveal the top card of your library. If it's a creature card, put it onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.
 SVar:TrigDig:AB$Dig | Cost$ 0 | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Creature | DestinationZone$ Battlefield | RememberChanged$ True | LibraryPosition2$ 0 | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | Permanent$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | SubAbility$ DBPump2
+SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/killer_instinct.jpg
 Oracle:At the beginning of your upkeep, reveal the top card of your library. If it's a creature card, put it onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/k/krovikan_elementalist.txt b/res/cardsfolder/k/krovikan_elementalist.txt
index fd3d13f67ca..1dd30adfc0f 100644
--- a/res/cardsfolder/k/krovikan_elementalist.txt
+++ b/res/cardsfolder/k/krovikan_elementalist.txt
@@ -3,7 +3,8 @@ ManaCost:B B
 Types:Creature Human Wizard
 PT:1/1
 A:AB$ Pump | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | SpellDescription$ Target creature gets +1/+0 until end of turn.
-A:AB$ Pump | Cost$ U U | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Flying & At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ Target creature you control gains flying until end of turn. Sacrifice it at the beginning of the next end step.
+A:AB$ Pump | Cost$ U U | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Flying | SubAbility$ DBPump | SpellDescription$ Target creature you control gains flying until end of turn. Sacrifice it at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/krovikan_elementalist.jpg
 Oracle:{2}{R}: Target creature gets +1/+0 until end of turn.\n{U}{U}: Target creature you control gains flying until end of turn. Sacrifice it at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/l/lowland_oaf.txt b/res/cardsfolder/l/lowland_oaf.txt
index 4e95ca4f9b5..342e03be065 100644
--- a/res/cardsfolder/l/lowland_oaf.txt
+++ b/res/cardsfolder/l/lowland_oaf.txt
@@ -2,7 +2,8 @@ Name:Lowland Oaf
 ManaCost:3 R
 Types:Creature Giant Warrior
 PT:3/3
-A:AB$ Pump | Cost$ T | ValidTgts$ Goblin.YouCtrl | TgtPrompt$ Select Goblin you control | NumAtt$ +1 | NumDef$ +0 | KW$ Flying & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ Target Goblin creature you control gets +1/+0 and gains flying until end of turn. Sacrifice that creature at the beginning of the next end step.
+A:AB$ Pump | Cost$ T | ValidTgts$ Goblin.YouCtrl | TgtPrompt$ Select Goblin you control | NumAtt$ +1 | NumDef$ +0 | KW$ Flying | SubAbility$ DBPump | SpellDescription$ Target Goblin creature you control gets +1/+0 and gains flying until end of turn. Sacrifice that creature at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lowland_oaf.jpg
 Oracle:{T}: Target Goblin creature you control gets +1/+0 and gains flying until end of turn. Sacrifice that creature at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/p/pyric_salamander.txt b/res/cardsfolder/p/pyric_salamander.txt
index 3dca17c6d58..84df21486e2 100644
--- a/res/cardsfolder/p/pyric_salamander.txt
+++ b/res/cardsfolder/p/pyric_salamander.txt
@@ -2,7 +2,8 @@ Name:Pyric Salamander
 ManaCost:1 R
 Types:Creature Salamander
 PT:1/1
-A:AB$ Pump | Cost$ R | NumAtt$ +1 | KW$ At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ CARDNAME gets +1/+0 until end of turn. Sacrifice CARDNAME at the beginning of the next end step.
+A:AB$ Pump | Cost$ R | NumAtt$ +1 | SubAbility$ DBPump | SpellDescription$ CARDNAME gets +1/+0 until end of turn. Sacrifice CARDNAME at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | KW$ At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pyric_salamander.jpg
 Oracle:{R}: Pyric Salamander gets +1/+0 until end of turn. Sacrifice Pyric Salamander at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/s/sneak_attack.txt b/res/cardsfolder/s/sneak_attack.txt
index ab6e75f011c..9608a3c23fe 100644
--- a/res/cardsfolder/s/sneak_attack.txt
+++ b/res/cardsfolder/s/sneak_attack.txt
@@ -2,8 +2,7 @@ Name:Sneak Attack
 ManaCost:3 R
 Types:Enchantment
 A:AB$ ChangeZone | Cost$ R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice the creature at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | Permanent$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NonStackingEffect:True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/soulshriek.txt b/res/cardsfolder/s/soulshriek.txt
index f3911d458d5..244776a5c80 100644
--- a/res/cardsfolder/s/soulshriek.txt
+++ b/res/cardsfolder/s/soulshriek.txt
@@ -1,7 +1,8 @@
 Name:Soulshriek
 ManaCost:B
 Types:Instant
-A:SP$ Pump | Cost$ B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | References$ X | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
+A:SP$ Pump | Cost$ B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | References$ X | SubAbility$ DBPump | SpellDescription$ Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:X:Count$TypeInYourYard.Creature
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soulshriek.jpg
diff --git a/res/cardsfolder/t/tears_of_rage.txt b/res/cardsfolder/t/tears_of_rage.txt
index a73e233a7d1..58c288efea0 100644
--- a/res/cardsfolder/t/tears_of_rage.txt
+++ b/res/cardsfolder/t/tears_of_rage.txt
@@ -2,7 +2,8 @@ Name:Tears of Rage
 ManaCost:2 R R
 Types:Instant
 Text:Cast CARDNAME only during the declare attackers step.\r\n
-A:SP$ PumpAll | Cost$ 2 R R | ActivationPhases$ Declare Attackers | ValidCards$ Creature.attacking+YouCtrl | NumAtt$ +X | References$ X | KW$ Trample & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ Attacking creatures you control get +X/+0 until end of turn, where X is the number of attacking creatures. Sacrifice those creatures at the beginning of the next end step.
+A:SP$ PumpAll | Cost$ 2 R R | ActivationPhases$ Declare Attackers | ValidCards$ Creature.attacking+YouCtrl | NumAtt$ +X | References$ X | SubAbility$ DBPump | SpellDescription$ Attacking creatures you control get +X/+0 until end of turn, where X is the number of attacking creatures. Sacrifice those creatures at the beginning of the next end step.
+SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.attacking+YouCtrl | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:X:Count$Valid Creature.attacking+YouCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tears_of_rage.jpg
diff --git a/res/cardsfolder/t/through_the_breach.txt b/res/cardsfolder/t/through_the_breach.txt
index 0638d72c012..fddcc619e04 100644
--- a/res/cardsfolder/t/through_the_breach.txt
+++ b/res/cardsfolder/t/through_the_breach.txt
@@ -2,8 +2,7 @@ Name:Through the Breach
 ManaCost:4 R
 Types:Instant Arcane
 A:SP$ ChangeZone | Cost$ 4 R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice that creature at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | Permanent$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 K:Splice onto Arcane 2 R R
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/t/treacherous_urge.txt b/res/cardsfolder/t/treacherous_urge.txt
index c2ed496fb72..b21a2da728c 100644
--- a/res/cardsfolder/t/treacherous_urge.txt
+++ b/res/cardsfolder/t/treacherous_urge.txt
@@ -2,8 +2,7 @@ Name:Treacherous Urge
 ManaCost:4 B
 Types:Instant
 A:SP$ ChangeZone | Cost$ 4 B | Origin$ Hand | Destination$ Battlefield | ValidTgts$ Opponent | ChangeType$ Creature | GainControl$ True | SubAbility$ DBPump | RememberChanged$ True | IsCurse$ True | SpellDescription$ Target opponent reveals his or her hand. You may put a creature card from it onto the battlefield under your control. That creature has haste. Sacrifice it at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | Permanent$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treacherous_urge.jpg
 Oracle:Target opponent reveals his or her hand. You may put a creature card from it onto the battlefield under your control. That creature has haste. Sacrifice it at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/v/varchilds_crusader.txt b/res/cardsfolder/v/varchilds_crusader.txt
index 35782f0a51b..2dc444683f8 100644
--- a/res/cardsfolder/v/varchilds_crusader.txt
+++ b/res/cardsfolder/v/varchilds_crusader.txt
@@ -2,7 +2,8 @@ Name:Varchild's Crusader
 ManaCost:3 R
 Types:Creature Human Knight
 PT:3/2
-A:AB$ Pump | Cost$ 0 | KW$ CantBeBlockedBy Creature.nonWall & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ CARDNAME can't be blocked this turn except by Walls. Sacrifice CARDNAME at the beginning of the next end step.
+A:AB$ Pump | Cost$ 0 | KW$ HIDDEN CantBeBlockedBy Creature.nonWall | SubAbility$ DBPump | SpellDescription$ CARDNAME can't be blocked this turn except by Walls. Sacrifice CARDNAME at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/varchilds_crusader.jpg
 Oracle:{0}: Varchild's Crusader can't be blocked this turn except by Walls. Sacrifice Varchild's Crusader at the beginning of the next end step.
\ No newline at end of file
diff --git a/res/cardsfolder/w/wine_of_blood_and_iron.txt b/res/cardsfolder/w/wine_of_blood_and_iron.txt
index d01bf359474..89699410304 100644
--- a/res/cardsfolder/w/wine_of_blood_and_iron.txt
+++ b/res/cardsfolder/w/wine_of_blood_and_iron.txt
@@ -2,7 +2,7 @@ Name:Wine of Blood and Iron
 ManaCost:3
 Types:Artifact
 A:AB$ Pump | Cost$ 4 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | SubAbility$ DBPump | SpellDescription$ Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice CARDNAME at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Self
+SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Self | Permanent$ True
 SVar:X:Targeted$CardPower
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wine_of_blood_and_iron.jpg
diff --git a/res/quest/bazaar/hound_pet_l4.txt b/res/quest/bazaar/hound_pet_l4.txt
index a11e2b37cf5..8ddd423e385 100644
--- a/res/quest/bazaar/hound_pet_l4.txt
+++ b/res/quest/bazaar/hound_pet_l4.txt
@@ -4,6 +4,6 @@ Colors:red
 Types:Creature Hound Pet
 PT:2/1
 K:Haste
-A:AB$ Pump | Cost$ X 1 | ValidCards$ Card.Self | NumAtt$ +X | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ CARDNAME gets +X/+0 until end of turn. Sacrifice it at the beginning of the next end step.
-SVar:X:Count$xPaid
-End
\ No newline at end of file
+A:AB$ Pump | Cost$ X 1 | Defined$ Self | NumAtt$ +X | SubAbility$ DBPump | SpellDescription$ CARDNAME gets +X/+0 until end of turn. Sacrifice it at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Permanent$ True
+SVar:X:Count$xPaid
\ No newline at end of file