diff --git a/res/cardsfolder/b/bramblewood_paragon.txt b/res/cardsfolder/b/bramblewood_paragon.txt
index ddea7097bd7..c4c56a6b8b0 100644
--- a/res/cardsfolder/b/bramblewood_paragon.txt
+++ b/res/cardsfolder/b/bramblewood_paragon.txt
@@ -3,8 +3,9 @@ ManaCost:1 G
 Types:Creature Elf Warrior
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Warrior+Other+YouCtrl |TriggerZones$ Battlefield | Execute$ TrigPutCounter | Static$ True | TriggerDescription$ Each other Warrior creature you control enters the battlefield with an additional +1/+1 counter on it.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Battlefield | ValidCard$ Creature.Warrior+YouCtrl+Other | ReplaceWith$ AddExtraCounter | Description$ Each other Warrior creature you control enters the battlefield with an additional +1/+1 counter on it.
+SVar:AddExtraCounter:AB$ PutCounter | Cost$ 0 | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToBattlefield
+SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddKeyword$ Trample | Description$ Each creature you control with a +1/+1 counter on it has trample.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bramblewood_paragon.jpg
diff --git a/res/cardsfolder/d/dearly_departed.txt b/res/cardsfolder/d/dearly_departed.txt
index bd245ad78dd..a4c43b0825b 100644
--- a/res/cardsfolder/d/dearly_departed.txt
+++ b/res/cardsfolder/d/dearly_departed.txt
@@ -1,13 +1,14 @@
-Name:Dearly Departed
-ManaCost:4 W W
-Types:Creature Spirit
-Text:no text
-PT:5/5
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Human+YouCtrl | TriggerZones$ Graveyard | Static$ True | Execute$ TrigPutCounter | TriggerDescription$ As long as CARDNAME is in your graveyard, each Human creature you control enters the battlefield with an additional +1/+1 counter on it.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/dearly_departed.jpg
-SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/9.jpg
-Oracle:Flying\nAs long as Dearly Departed is in your graveyard, each Human creature you control enters the battlefield with an additional +1/+1 counter on it.
+Name:Dearly Departed
+ManaCost:4 W W
+Types:Creature Spirit
+Text:no text
+PT:5/5
+K:Flying
+R:Event$ Moved | ActiveZones$ Graveyard | Destination$ Battlefield | ValidCard$ Creature.Human+YouCtrl | ReplaceWith$ AddExtraCounter | Description$ As long as CARDNAME is in your graveyard, each Human creature you control enters the battlefield with an additional +1/+1 counter on it.
+SVar:AddExtraCounter:AB$ PutCounter | Cost$ 0 | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToBattlefield
+SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dearly_departed.jpg
+SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/9.jpg
+Oracle:Flying\nAs long as Dearly Departed is in your graveyard, each Human creature you control enters the battlefield with an additional +1/+1 counter on it.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/m/master_biomancer.txt b/res/cardsfolder/m/master_biomancer.txt
index a5f9b1f0369..0f2e1f96fd4 100644
--- a/res/cardsfolder/m/master_biomancer.txt
+++ b/res/cardsfolder/m/master_biomancer.txt
@@ -3,9 +3,10 @@ ManaCost:2 G U
 Types:Creature Elf Wizard
 Text:no text
 PT:2/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | Static$ True | TriggerDescription$ Each other creature you control enters the battlefield with a number of additional +1/+1 counters on it equal to Master Biomancer's power and as a Mutant in addition to its other types.
-SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ X | References$ X | SubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Types$ Mutant | Permanent$ True | Defined$ TriggeredCard
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+Other | ReplaceWith$ AddExtraCounter | Description$ Each other creature you control enters the battlefield with a number of additional +1/+1 counters on it equal to CARDNAME's power and as a Mutant in addition to its other types.
+SVar:AddExtraCounter:AB$ PutCounter | Cost$ 0 | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ X | References$ X | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Types$ Mutant | Permanent$ True | Defined$ ReplacedCard | SubAbility$ MoveToBattlefield
+SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:X:Count$CardPower
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/master_biomancer.jpg
diff --git a/res/cardsfolder/o/oonas_blackguard.txt b/res/cardsfolder/o/oonas_blackguard.txt
index 798e2ced86f..0e29deca4c1 100644
--- a/res/cardsfolder/o/oonas_blackguard.txt
+++ b/res/cardsfolder/o/oonas_blackguard.txt
@@ -4,8 +4,9 @@ Types:Creature Faerie Rogue
 Text:no text
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Rogue+Other+YouCtrl |TriggerZones$ Battlefield | Execute$ TrigPutCounter | Static$ True | TriggerDescription$ Each other Rogue creature you control enters the battlefield with an additional +1/+1 counter on it.
-SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Battlefield | ValidCard$ Creature.Rogue+YouCtrl+Other | ReplaceWith$ AddExtraCounter | Description$ Each other Rogue creature you control enters the battlefield with an additional +1/+1 counter on it.
+SVar:AddExtraCounter:AB$ PutCounter | Cost$ 0 | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToBattlefield
+SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl+counters_GE1_P1P1 | ValidTarget$ Player | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigDiscardOpp | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it deals combat damage to a player, that player discards a card.
 SVar:TrigDiscardOpp:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:PlayMain1:TRUE