diff --git a/res/cardsfolder/pestilence.txt b/res/cardsfolder/pestilence.txt
index 625be639150..478421e269e 100644
--- a/res/cardsfolder/pestilence.txt
+++ b/res/cardsfolder/pestilence.txt
@@ -1,7 +1,10 @@
 Name:Pestilence
 ManaCost:2 B B
 Types:Enchantment
-Text:At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME.
+Text:no text
+T:Mode$ Phase | Phase$ End Of Turn | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME. 
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
+A:AB$ DamageAll | Cost$ B | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Each | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature and each player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/uz/en-us/card5619.jpg
 SetInfo:USG|Common|http://magiccards.info/scans/en/us/147.jpg
diff --git a/res/cardsfolder/pyrohemia.txt b/res/cardsfolder/pyrohemia.txt
index d24b9696157..3bb9647a428 100644
--- a/res/cardsfolder/pyrohemia.txt
+++ b/res/cardsfolder/pyrohemia.txt
@@ -1,7 +1,10 @@
 Name:Pyrohemia
 ManaCost:2 R R
 Types:Enchantment
-Text:At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME.
+Text:no text
+T:Mode$ Phase | Phase$ End Of Turn | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME. 
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
+A:AB$ DamageAll | Cost$ R | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Each | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature and each player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card122436.jpg
 SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/119.jpg
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 02fde6bfb99..4f1d00769f9 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -4857,119 +4857,7 @@ public class CardFactory implements NewConstants {
         if (card2 != null)
         	return postFactoryKeywords(card2);
         
-        //*************** START *********** START **************************
-        else if(cardName.equals("Pyrohemia")) {
-            SpellAbility ability = new Ability(card, "R") {
-                @Override
-                public boolean canPlayAI() {
-                    CardList human = new CardList(AllZone.Human_Battlefield.getCards());
-                    CardList computer = new CardList(AllZone.Computer_Battlefield.getCards());
-                    
-                    human = human.getType("Creature");
-                    computer = computer.getType("Creature");
-                    
-                    return AllZone.ComputerPlayer.getLife() > 2 && !(human.size() == 0 && 0 < computer.size()) && super.canPlayAI();
-                }
-                
-                @Override
-                public void resolve() {
-                    //get all creatures
-                    CardList list = AllZoneUtil.getCreaturesInPlay();
-                    
-                    for(int i = 0; i < list.size(); i++) {
-                        list.get(i).addDamage(1, card);
-                    }
-                    
-                    AllZone.HumanPlayer.addDamage(1, card);
-                    AllZone.ComputerPlayer.addDamage(1, card);
-                }//resolve()
-            };//SpellAbility
-            ability.setDescription("R: Pyrohemia deals 1 damage to each creature and each player.");
-            
-            StringBuilder sb = new StringBuilder();
-            sb.append(card).append(" deals 1 damage to each creature and each player.");
-            ability.setStackDescription(sb.toString());
-            
-            card.clearSpellAbility();
-            card.addSpellAbility(new Spell_Permanent(card) {
-                private static final long serialVersionUID = 5596915641671666843L;
-                
-                @Override
-                public boolean canPlayAI() {
-                    //get all creatures
-                    CardList list = AllZoneUtil.getCreaturesInPlay();
-                    
-                    return 0 < list.size();
-                }
-            });
-            
-            card.addSpellAbility(ability);
-            
-            card.setSVar("PlayMain1", "TRUE");
-        }
-        //*************** END ************ END **************************
-        
 
-        //*************** START *********** START **************************
-        else if(cardName.equals("Pestilence")) {
-            SpellAbility ability = new Ability(card, "B") {
-                @Override
-                public boolean canPlayAI() {
-                    CardList human = new CardList(AllZone.Human_Battlefield.getCards());
-                    CardList computer = new CardList(AllZone.Computer_Battlefield.getCards());
-                    
-                    human = human.getType("Creature");
-                    computer = computer.getType("Creature");
-                    
-                    return AllZone.ComputerPlayer.getLife() > 2 && !(human.size() == 0 && 0 < computer.size());
-                }
-                
-                @Override
-                public void resolve() {
-                    //get all creatures
-                    CardList list = new CardList();
-                    list.addAll(AllZone.Human_Battlefield.getCards());
-                    list.addAll(AllZone.Computer_Battlefield.getCards());
-                    list = list.getType("Creature");
-                    
-                    for(int i = 0; i < list.size(); i++) {
-                        	HashMap<Card, Integer> m = new HashMap<Card, Integer>();
-                        	m.put(card, 1);
-                        	list.get(i).addDamage(m);
-                    }
-                    
-                    AllZone.HumanPlayer.addDamage(1, card);
-                    AllZone.ComputerPlayer.addDamage(1, card);
-                }//resolve()
-            };//SpellAbility
-            ability.setDescription("B: Pestilence deals 1 damage to each creature and each player.");
-            
-            StringBuilder sb = new StringBuilder();
-            sb.append(card).append(" deals 1 damage to each creature and each player.");
-            ability.setStackDescription(sb.toString());
-            
-            card.clearSpellAbility();
-            card.addSpellAbility(new Spell_Permanent(card) {
-                private static final long serialVersionUID = -4163089323122672307L;
-                
-                @Override
-                public boolean canPlayAI() {
-                    //get all creatures
-                    CardList list = new CardList();
-                    list.addAll(AllZone.Human_Battlefield.getCards());
-                    list.addAll(AllZone.Computer_Battlefield.getCards());
-                    list = list.getType("Creature");
-                    
-                    return 0 < list.size();
-                }
-            });
-            
-            card.addSpellAbility(ability);
-            
-            card.setSVar("PlayMain1", "TRUE");
-        }
-        //*************** END ************ END **************************
-        
         //*************** START *********** START **************************
         else if(cardName.equals("Bridge from Below")) {
             SpellAbility spell = new Spell_Permanent(card) {