diff --git a/res/cardsfolder/elvish_farmer.txt b/res/cardsfolder/elvish_farmer.txt
index 887f0ecdb01..70b5043ec31 100644
--- a/res/cardsfolder/elvish_farmer.txt
+++ b/res/cardsfolder/elvish_farmer.txt
@@ -1,9 +1,10 @@
 Name:Elvish Farmer
 ManaCost:1 G
 Types:Creature Elf
-Text:At the beginning of your upkeep, put a spore counter on Elvish Farmer.
+Text:At the beginning of your upkeep, put a spore counter on CARDNAME.
 PT:0/2
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$GainLife | Cost$Sac<1/Saproling> | LifeAmount$2 | SpellDescription$You gain 2 life.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_farmer.jpg
 SetInfo:FEM|Rare|http://magiccards.info/scans/en/fe/71.jpg
diff --git a/res/cardsfolder/mycologist.txt b/res/cardsfolder/mycologist.txt
index 8d5dd24ea8e..098bf998cfc 100644
--- a/res/cardsfolder/mycologist.txt
+++ b/res/cardsfolder/mycologist.txt
@@ -1,9 +1,10 @@
 Name:Mycologist
 ManaCost:1 W
 Types:Creature Human Druid
-Text:At the beginning of your upkeep, put a spore counter on Mycologist.
+Text:At the beginning of your upkeep, put a spore counter on CARDNAME.
 PT:0/2
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$GainLife | Cost$Sac<1/Saproling> | LifeAmount$2 | SpellDescription$You gain 2 life.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mycologist.jpg
 SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/27.jpg
diff --git a/res/cardsfolder/psychotrope_thallid.txt b/res/cardsfolder/psychotrope_thallid.txt
index 7b3c15b49f4..a5a41a21fdd 100644
--- a/res/cardsfolder/psychotrope_thallid.txt
+++ b/res/cardsfolder/psychotrope_thallid.txt
@@ -1,9 +1,10 @@
 Name:Psychotrope Thallid
 ManaCost:2 G
 Types:Creature Fungus
-Text:At the beginning of your upkeep, put a spore counter on Psychotrope Thallid.
+Text:At the beginning of your upkeep, put a spore counter on CARDNAME.
 PT:1/1
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Draw | Cost$Sac<1/Saproling> | NumCards$1 | SpellDescription$Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/psychotrope_thallid.jpg
 SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/137.jpg
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 72bfd71f532..38d4a206c08 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -9586,7 +9586,7 @@ public class CardFactory_Creatures {
                 });
             }//*************** END ************ END **************************         
 
-        
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Elvish Farmer") || cardName.equals("Mycologist")) {
             Command intoPlay = new Command() {
@@ -9677,7 +9677,7 @@ public class CardFactory_Creatures {
             
             a2.setBeforePayMana(runtime);
         }//*************** END ************ END **************************
-        
+        */
         
         //*************** START *********** START **************************
         else if(cardName.equals("Pallid Mycoderm")) {
@@ -9779,7 +9779,7 @@ public class CardFactory_Creatures {
             a2.setBeforePayMana(runtime);
         }//*************** END ************ END **************************
         
-        
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Psychotrope Thallid")) {
             Command intoPlay = new Command() {
@@ -9841,7 +9841,7 @@ public class CardFactory_Creatures {
             
             a2.setBeforePayMana(runtime);
         }//*************** END ************ END **************************
-
+		*/
         
         //*************** START *********** START **************************
         else if(cardName.equals("Rootwater Thief")) {