diff --git a/res/cardsfolder/c/curse_of_wizardry.txt b/res/cardsfolder/c/curse_of_wizardry.txt
index b9295c12608..ac657c8e7ca 100644
--- a/res/cardsfolder/c/curse_of_wizardry.txt
+++ b/res/cardsfolder/c/curse_of_wizardry.txt
@@ -1,7 +1,11 @@
 Name:Curse of Wizardry
 ManaCost:2 B B
 Types:Enchantment
-Text:As Curse of Wizardry enters the battlefield, choose a color.\r\nWhenever a player casts a spell of the chosen color, that player loses 1 life.
+Text:no text
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True| TriggerDescription$ As CARDNAME enters the battlefield, choose a color.
+SVar:ChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You | AILogic$ MostProminentInHumanDeck 
+T:Mode$ SpellCast | ValidCard$ Card.ChosenColor | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a player casts a spell of the chosen color, that player loses 1 life.
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_wizardry.jpg
 SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/104.jpg
diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java
index 66adc8efaa8..b46f47a7bba 100644
--- a/src/main/java/forge/GameActionUtil.java
+++ b/src/main/java/forge/GameActionUtil.java
@@ -52,7 +52,7 @@ public final class GameActionUtil {
         //playCard_Storm(sa);
 
         playCard_Vengevine(c);
-        playCard_Curse_of_Wizardry(c);
+        //playCard_Curse_of_Wizardry(c);
         playCard_Venser_Emblem(c);
         playCard_Ichneumon_Druid(c);
 
@@ -455,7 +455,7 @@ public final class GameActionUtil {
      *
      * @param c a {@link forge.Card} object.
      */
-    public static void playCard_Curse_of_Wizardry(final Card c) {
+    /*public static void playCard_Curse_of_Wizardry(final Card c) {
         CardList list = AllZoneUtil.getCardsIn(Zone.Battlefield, "Curse of Wizardry");
 
         if (list.size() > 0) {
@@ -481,7 +481,7 @@ public final class GameActionUtil {
                 }
             } //if
         } //if
-    } //Curse of Wizardry
+    }*/ //Curse of Wizardry
 
     /**
      * <p>payManaDuringAbilityResolve.</p>
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
index 20f09d723ea..cd490355bee 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
@@ -578,10 +578,19 @@ public class AbilityFactory_Choose {
                     String choice = (String) o;
                     card.setChosenColor(choice);
                 } else {
-                    //TODO - needs improvement
-                    card.setChosenColor(Constant.Color.Black);
-                    String message = "Computer chooses " + Constant.Color.Black;
-                    JOptionPane.showMessageDialog(null, message, "" + card, JOptionPane.PLAIN_MESSAGE);
+                    String chosen = "";
+                    if (params.containsKey("AILogic")) {
+                        String logic = params.get("AILogic");
+                        if (logic.equals("MostProminentInHumanDeck")) {
+                            chosen = CardFactoryUtil.getMostProminentColor(
+                                    AllZoneUtil.getCardsInGame().getController(AllZone.getHumanPlayer()));
+                        }
+                    }
+                    if (chosen.equals("")) {
+                        chosen = Constant.Color.Green;
+                    }
+                    GuiUtils.getChoice("Computer picked: ", chosen);
+                    card.setChosenColor(chosen);
                 }
             }
         }
diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
index 370355d387b..0f3b57d131a 100644
--- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
+++ b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
@@ -1137,7 +1137,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
 
 
         //*************** START *********** START **************************
-        else if (cardName.equals("Curse of Wizardry")) {
+        /*else if (cardName.equals("Curse of Wizardry")) {
             final Ability ability = new Ability(card, "0") {
                 @Override
                 public void resolve() {
@@ -1181,7 +1181,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
             ability.setStackDescription(sb.toString());
 
             card.addComesIntoPlayCommand(comesIntoPlay);
-        } //*************** END ************ END **************************
+        }*/ //*************** END ************ END **************************
 
 
         //*************** START *********** START **************************