diff --git a/res/cardsfolder/nath_of_the_gilt_leaf.txt b/res/cardsfolder/nath_of_the_gilt_leaf.txt
index dc76d1831e0..9c8dec40859 100644
--- a/res/cardsfolder/nath_of_the_gilt_leaf.txt
+++ b/res/cardsfolder/nath_of_the_gilt_leaf.txt
@@ -1,7 +1,7 @@
 Name:Nath of the Gilt-Leaf
 ManaCost:3 B G
 Types:Legendary Creature Elf Warrior
-Text:At the beginning of your upkeep, you may have target opponent discard a card at random. Whenever an opponent discards a card, you may put a 1/1 green Elf Warrior creature token into play.
+Text:At the beginning of your upkeep, you may have target opponent discard a card at random.\r\nWhenever an opponent discards a card, you may put a 1/1 green Elf Warrior creature token into play.
 PT:4/4
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nath_of_the_gilt_leaf.jpg
diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index 9475cb9503a..ebd51ebf70f 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -330,24 +330,8 @@ public class GameAction {
         for(int i = 0; i < opponentList.size(); i++) {
             Card card = opponentList.get(i);
             if(card.getName().equals("Nath of the Gilt-Leaf")) {
-                Card c = new Card();
-                
-                c.setOwner(card.getController());
-                c.setController(card.getController());
-                
-                c.setName("Elf Warrior");
-                c.setImageName("G 1 1 Elf Warrior");
-                c.setManaCost("G");
-                c.addColor("G");
-                c.setToken(true);
-                
-                c.addType("Creature");
-                c.addType("Elf");
-                c.addType("Warrior");
-                c.setBaseAttack(1);
-                c.setBaseDefense(1);
-                
-                opponentZone.add(c);
+                CardFactoryUtil.makeToken("Elf Warrior", "G 1 1 Elf Warrior", opponent, "G", 
+                		new String[] {"Creature", "Elf", "Warrior"}, 1, 1, new String[] {});
             }
         }
     }