diff --git a/res/cardsfolder/devout_monk.txt b/res/cardsfolder/devout_monk.txt
index ee297d7f6be..db6c557166e 100644
--- a/res/cardsfolder/devout_monk.txt
+++ b/res/cardsfolder/devout_monk.txt
@@ -1,9 +1,9 @@
 Name:Devout Monk
 ManaCost:W
 Types:Creature Human Monk Cleric
-Text:no text
-PT:1/1
-K:WheneverKeyword:EntersBattleField:Self:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Devout Monk enters the battlefield, you gain 1 life.
+Text:When Devout Monk enters the battlefield, you gain 1 life.
+PT:1/1
+K:etbGainLife:1
 SVar:Rarity:Common
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Starter_1999/devout_monk.jpg
 SetInfo:S99|Common|http://magiccards.info/scans/en/st/14.jpg
diff --git a/res/cardsfolder/kembas_skyguard.txt b/res/cardsfolder/kembas_skyguard.txt
index fe2986c3b1a..2ee2b205852 100644
--- a/res/cardsfolder/kembas_skyguard.txt
+++ b/res/cardsfolder/kembas_skyguard.txt
@@ -1,10 +1,10 @@
 Name:Kemba's Skyguard
 ManaCost:1 W W
 Types:Creature Cat Knight
-Text:no text
+Text:When Kemba's Skyguard enters the battlefield, you gain 2 life.
 PT:2/2
 K:Flying
-K:WheneverKeyword:EntersBattleField:Self:Play:ModifyLife/2:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Kemba's Skyguard enters the battlefield, you gain 2 life.
+K:etbGainLife:2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kembas_skyguard.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/13.jpg
diff --git a/res/cardsfolder/kitchen_finks.txt b/res/cardsfolder/kitchen_finks.txt
index 5eba8d08a0c..5cac37be1d5 100644
--- a/res/cardsfolder/kitchen_finks.txt
+++ b/res/cardsfolder/kitchen_finks.txt
@@ -3,7 +3,8 @@ ManaCost:1 GW GW
 Types:Creature Ouphe
 Text:When CARDNAME enters the battlefield, you gain 2 life.
 PT:3/2
-K:Persist
+K:Persist
+K:etbGainLife:2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kitchen_finks.jpg
 SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/229.jpg
diff --git a/res/cardsfolder/pelakka_wurm.txt b/res/cardsfolder/pelakka_wurm.txt
index 9394a479510..b9c9ee5feb7 100644
--- a/res/cardsfolder/pelakka_wurm.txt
+++ b/res/cardsfolder/pelakka_wurm.txt
@@ -1,10 +1,10 @@
 Name:Pelakka Wurm
 ManaCost:4 G G G
 Types:Creature Wurm
-Text:no text
+Text:When Pelakka Wurm enters the battlefield, you gain 7 life.
 PT:7/7
-K:Trample
-K:WheneverKeyword:EntersBattleField:Self:Play:ModifyLife/7:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Pelakka Wurm enters the battlefield, you gain 7 life.
+K:Trample
+K:etbGainLife:7
 K:WheneverKeyword:PermanentIntoGraveyard:Self:Graveyard:DrawCards/1:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Pelakka Wurm is put into a graveyard from the battlefield, draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pelakka_wurm.jpg
diff --git a/res/cardsfolder/shu_grain_caravan.txt b/res/cardsfolder/shu_grain_caravan.txt
index 268c961d7e2..e704274966d 100644
--- a/res/cardsfolder/shu_grain_caravan.txt
+++ b/res/cardsfolder/shu_grain_caravan.txt
@@ -2,7 +2,8 @@ Name:Shu Grain Caravan
 ManaCost:2 W
 Types:Creature Human Soldier
 Text:When Shu Grain Caravan enters the battlefield, you gain 2 life.
-PT:2/2
+PT:2/2
+K:etbGainLife:2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shu_grain_caravan.jpg
 SetInfo:PTK|Common|http://magiccards.info/scans/en/p3k/26.jpg
diff --git a/res/cardsfolder/temple_acolyte.txt b/res/cardsfolder/temple_acolyte.txt
index 5114636100c..387e9bac24d 100644
--- a/res/cardsfolder/temple_acolyte.txt
+++ b/res/cardsfolder/temple_acolyte.txt
@@ -1,9 +1,9 @@
 Name:Temple Acolyte
 ManaCost:1 W
 Types:Creature Human Cleric
-Text:no text
+Text:When CARDNAME enters the battlefield, you gain 3 life.
 PT:1/3
-K:WheneverKeyword:EntersBattleField:Self:Play:ModifyLife/3:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Temple Acolyte enters the battlefield, you gain 3 life.
+K:etbGainLife:3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_acolyte.jpg
 SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/143.jpg
diff --git a/res/cardsfolder/venerable_monk.txt b/res/cardsfolder/venerable_monk.txt
index 5d5c077caec..f50d938cee9 100644
--- a/res/cardsfolder/venerable_monk.txt
+++ b/res/cardsfolder/venerable_monk.txt
@@ -2,7 +2,8 @@ Name:Venerable Monk
 ManaCost:2 W
 Types:Creature Cleric
 Text:When CARDNAME enters the battlefield, you gain 2 life.
-PT:2/2
+PT:2/2
+K:etbGainLife:2
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83441.jpg
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/55.jpg
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 69c1c5a1b92..289d821ccc6 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -356,7 +356,7 @@ public class CardFactory_Creatures {
             card.addComesIntoPlayCommand(intoPlay);
         }//*************** END ************ END **************************
         
-
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Venerable Monk") || cardName.equals("Kitchen Finks")
                 || cardName.equals("Shu Grain Caravan")) {
@@ -382,7 +382,7 @@ public class CardFactory_Creatures {
             };
             card.addComesIntoPlayCommand(intoPlay);
         }//*************** END ************ END **************************
-        
+        */
         /*
         //*************** START *********** START **************************
         else if(cardName.equals("Radiant's Dragoons")) {