diff --git a/res/cardsfolder/omnath_locus_of_mana.txt b/res/cardsfolder/omnath_locus_of_mana.txt
index c8171508fff..3a769da93aa 100644
--- a/res/cardsfolder/omnath_locus_of_mana.txt
+++ b/res/cardsfolder/omnath_locus_of_mana.txt
@@ -1,8 +1,12 @@
 Name:Omnath, Locus of Mana
 ManaCost:2 G
 Types:Legendary Creature Elemental
-Text:Green mana doesn't empty from your mana pool as steps and phases end.\r\nOmnath, Locus of Mana gets +1/+1 for each green mana in your mana pool.
+Text:Green mana doesn't empty from your mana pool as steps and phases end.
 PT:1/1
+K:stPumpSelf:Permanent:X/X:No Condition:CARDNAME gets +1/+1 for each green mana in your mana pool.
+SVar:X:Count$ManaPool:green
+#AI doesn't have a mana pool
+SVar:RemAIDeck:True
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omnath_locus_of_mana.jpg
 SetInfo:WWK|Mythic|http://magiccards.info/scans/en/wwk/109.jpg
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index 497b790169f..7d5b408ea3d 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -3353,6 +3353,12 @@ public class CardFactoryUtil {
         	return Integer.parseInt(number);
         }
         
+        //Manapool
+        if(l[0].contains("ManaPool")) {
+        	String color = l[0].split(":")[1];
+        	return AllZone.ManaPool.getAmountOfColor(color);
+        }
+        
         // count valid cards on the battlefield
         if(l[0].contains("Valid")) {
         	String restrictions = l[0].replace("Valid ", "");
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 12d74b1e02e..4250d6534dc 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -12759,20 +12759,6 @@ public class GameActionUtil {
 			}
 		}// execute()
 	};
-
-	public static Command Omnath = new Command() {
-		private static final long serialVersionUID = -22045167326100804L;
-
-		public void execute() {
-			// todo: when computer manapool is made, this needs to be fixed
-			CardList list = AllZoneUtil.getCardsInPlay("Omnath, Locus of Mana");
-			int bonus = AllZone.ManaPool.getAmountOfColor(Constant.Color.Green);
-			for(Card c: list){
-				c.setBaseAttack(bonus + 1);
-				c.setBaseDefense(bonus + 1);
-			}
-		}// execute()
-	};
 	
 	public static Command Dauntless_Escort = new Command() {
 		private static final long serialVersionUID = -2201201455269804L;
@@ -13879,7 +13865,6 @@ public class GameActionUtil {
 		commands.put("Muraganda_Petroglyphs", Muraganda_Petroglyphs);
 		
 		commands.put("Old_Man_of_the_Sea", Old_Man_of_the_Sea);
-		commands.put("Omnath", Omnath);
 		commands.put("Phylactery_Lich", Phylactery_Lich);
 		commands.put("Plague_Rats", Plague_Rats);
 		commands.put("Primalcrux", Primalcrux);
diff --git a/src/forge/ManaPool.java b/src/forge/ManaPool.java
index dec2e22e60e..e7038eb9d97 100644
--- a/src/forge/ManaPool.java
+++ b/src/forge/ManaPool.java
@@ -117,15 +117,6 @@ public class ManaPool extends Card {
     	for(Mana m : manaList){
     		addManaToPool(floatingMana, m);
     	}
-
-        //Omnath, Locus of Mana Pump Trigger
-        if(Phase.GameBegins == 1) {
-            CardList omnathList = AllZoneUtil.getPlayerCardsInPlay(owner, "Omnath, Locus of Mana");
-            if(omnathList.size() > 0) {
-            	Command com = GameActionUtil.commands.get("Omnath");
-                com.execute();
-            }
-        }
     }
     
     public void addManaToPaying(String manaStr, Card card) {
@@ -174,13 +165,7 @@ public class ManaPool extends Card {
     {
     	if (floatingMana.size() == 0) return;
     	
-    	if(Phase.GameBegins == 1){
-	    	CardList omnathList = AllZoneUtil.getPlayerCardsInPlay(owner, "Omnath, Locus of Mana");
-	    	if (omnathList.size() == 0){
-	    		floatingMana.clear();
-	    		return;
-	    	}
-	    	
+    	if(AllZoneUtil.isCardInPlay("Omnath, Locus of Mana", owner)) {
 	    	// Omnath in play, clear all non-green mana
 	    	int i = 0;
 	    	while(i < floatingMana.size()){
@@ -462,17 +447,6 @@ public class ManaPool extends Card {
             String[] cost = formatMana(mability);
             m = subtractMultiple(cost, m);
         }
-        
-        // is omnath block necessary here?
-        
-        //Omnath, Locus of Mana Pump Trigger
-        if(Phase.GameBegins == 1) {
-	    	CardList omnathList = AllZoneUtil.getPlayerCardsInPlay(owner, "Omnath, Locus of Mana");
-            if(omnathList.size() > 0) {
-            	Command com = GameActionUtil.commands.get("Omnath");
-                com.execute();
-            }
-        }
 
         return m;
     }
@@ -500,18 +474,6 @@ public class ManaPool extends Card {
 	    	else
 	    		break;
     	}
-    	
-        //Omnath, Locus of Mana Pump Trigger
-        if(Phase.GameBegins == 1) {
-            CardList Omnath_Human = new CardList();
-            PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, AllZone.HumanPlayer);                   
-            Omnath_Human.addAll(play.getCards());
-            Omnath_Human = Omnath_Human.getName("Omnath, Locus of Mana"); 
-            if(Omnath_Human.size() > 0) {
-            	Command com = GameActionUtil.commands.get("Omnath");
-                com.execute();
-            }
-        }
         return manaCost;
     }
     
diff --git a/src/forge/Phase.java b/src/forge/Phase.java
index bc66b1b3f59..0fe32d0bbfc 100644
--- a/src/forge/Phase.java
+++ b/src/forge/Phase.java
@@ -11,7 +11,7 @@ public class Phase extends MyObservable
 	private int phaseIndex;
 	private int turn;
 
-	static int	 	GameBegins = 0; // Omnath
+	static int	 	GameBegins = 0;
     static int	   StormCount;
     static int	   HighTideCount = 0;
     static int	   PlayerSpellCount;
diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java
index c17c4a8898b..763f3c20466 100644
--- a/src/forge/StaticEffects.java
+++ b/src/forge/StaticEffects.java
@@ -39,7 +39,6 @@ public class StaticEffects
 		cardToEffectsList.put("Muraganda Petroglyphs", new String[] {"Muraganda_Petroglyphs"});
 		
 		cardToEffectsList.put("Old Man of the Sea", new String[] {"Old_Man_of_the_Sea"});
-		cardToEffectsList.put("Omnath, Locus of Mana", new String[] {"Omnath"});
 		cardToEffectsList.put("Phylactery Lich", new String[]{"Phylactery_Lich"});
 		cardToEffectsList.put("Plague Rats", new String[] {"Plague_Rats"});
 		cardToEffectsList.put("Primalcrux",new String[] {"Primalcrux"});