diff --git a/src/main/java/forge/card/abilityfactory/SpellAiLogic.java b/src/main/java/forge/card/abilityfactory/SpellAiLogic.java
index 18e34bb3a7c..0143534fa15 100644
--- a/src/main/java/forge/card/abilityfactory/SpellAiLogic.java
+++ b/src/main/java/forge/card/abilityfactory/SpellAiLogic.java
@@ -17,7 +17,7 @@ public abstract class SpellAiLogic {
         return canPlayAI(aiPlayer, params, sa);
     }
     
-    public abstract boolean canPlayAI(final Player aiPlayer, final Map<String, String> params, final SpellAbility sa);
+    protected abstract boolean canPlayAI(final Player aiPlayer, final Map<String, String> params, final SpellAbility sa);
     
     public final boolean doTriggerAI(final Player aiPlayer, final Map<String, String> params, final SpellAbility sa, final boolean mandatory){
         if (!ComputerUtil.canPayCost(sa, aiPlayer) && !mandatory) {
diff --git a/src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java b/src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java
index 17a19479160..d0932826bbb 100644
--- a/src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java
@@ -74,7 +74,7 @@ public class AddTurnAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         return doTriggerAINoCost(aiPlayer, params, sa, false);
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/AlwaysPlayAi.java b/src/main/java/forge/card/abilityfactory/ai/AlwaysPlayAi.java
index 04990fe1af2..6fd430c2298 100644
--- a/src/main/java/forge/card/abilityfactory/ai/AlwaysPlayAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/AlwaysPlayAi.java
@@ -11,7 +11,7 @@ public class AlwaysPlayAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         return true;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/AnimateAi.java b/src/main/java/forge/card/abilityfactory/ai/AnimateAi.java
index e2d9fb91e0d..b89dfd0e917 100644
--- a/src/main/java/forge/card/abilityfactory/ai/AnimateAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/AnimateAi.java
@@ -31,7 +31,7 @@ public class AnimateAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
         final Card source = sa.getSourceCard();
     
diff --git a/src/main/java/forge/card/abilityfactory/ai/AnimateAllAi.java b/src/main/java/forge/card/abilityfactory/ai/AnimateAllAi.java
index 3c793b3c491..6a2544b4f29 100644
--- a/src/main/java/forge/card/abilityfactory/ai/AnimateAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/AnimateAllAi.java
@@ -7,7 +7,7 @@ import forge.game.player.Player;
 public class AnimateAllAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         return false;
     } // end animateAllCanPlayAI()
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/AttachAi.java b/src/main/java/forge/card/abilityfactory/ai/AttachAi.java
index 6378d659dab..30a3562466b 100644
--- a/src/main/java/forge/card/abilityfactory/ai/AttachAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/AttachAi.java
@@ -38,7 +38,7 @@ public class AttachAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Random r = MyRandom.getRandom();
         final Cost abCost = sa.getPayCosts();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/BondAi.java b/src/main/java/forge/card/abilityfactory/ai/BondAi.java
index f4be353cf7d..b96fe5bea45 100644
--- a/src/main/java/forge/card/abilityfactory/ai/BondAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/BondAi.java
@@ -42,7 +42,7 @@ public final class BondAi extends SpellAiLogic {
      * @return a boolean.
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         return true;
     } // end bondCanPlayAI()
 }
diff --git a/src/main/java/forge/card/abilityfactory/ai/CanPlayAsDrawbackAi.java b/src/main/java/forge/card/abilityfactory/ai/CanPlayAsDrawbackAi.java
index 377fdf6a715..c977e82583d 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CanPlayAsDrawbackAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CanPlayAsDrawbackAi.java
@@ -12,7 +12,7 @@ public class CanPlayAsDrawbackAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         return false;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/CannotPlayAi.java b/src/main/java/forge/card/abilityfactory/ai/CannotPlayAi.java
index 162725c5df4..c10f5f9bd82 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CannotPlayAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CannotPlayAi.java
@@ -11,7 +11,7 @@ public class CannotPlayAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         return false;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/ChangeZoneAllAi.java b/src/main/java/forge/card/abilityfactory/ai/ChangeZoneAllAi.java
index 9684b1ceb03..ccf5d92c6b8 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ChangeZoneAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ChangeZoneAllAi.java
@@ -25,7 +25,7 @@ public class ChangeZoneAllAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         // Change Zone All, can be any type moving from one zone to another
         final Cost abCost = sa.getAbilityFactory().getAbCost();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/CharmAi.java b/src/main/java/forge/card/abilityfactory/ai/CharmAi.java
index 4814a52b9c9..12ae4d08443 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CharmAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CharmAi.java
@@ -14,7 +14,7 @@ import forge.util.MyRandom;
 public class CharmAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Random r = MyRandom.getRandom();
 
         final int num = Integer.parseInt(params.containsKey("CharmNum") ? params.get("CharmNum") : "1");
diff --git a/src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java b/src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java
index 9f026547bcb..b2886ea0c45 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java
@@ -18,7 +18,7 @@ public class ChooseCardAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Card host = sa.getSourceCard();
 
         final Target tgt = sa.getTarget();
diff --git a/src/main/java/forge/card/abilityfactory/ai/ChooseCardNameAi.java b/src/main/java/forge/card/abilityfactory/ai/ChooseCardNameAi.java
index 35b51fb8c28..ac74a85c19d 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ChooseCardNameAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ChooseCardNameAi.java
@@ -16,7 +16,7 @@ public class ChooseCardNameAi extends SpellAiLogic {
     
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         
         if (params.containsKey("AILogic")) {
             // Don't tap creatures that may be able to block
diff --git a/src/main/java/forge/card/abilityfactory/ai/ChooseColorAi.java b/src/main/java/forge/card/abilityfactory/ai/ChooseColorAi.java
index dda2f9c7dd8..e8576a3ef6e 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ChooseColorAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ChooseColorAi.java
@@ -9,7 +9,7 @@ public class ChooseColorAi extends SpellAiLogic {
     
     
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         if (!params.containsKey("AILogic")) {
             return false;
         }
diff --git a/src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java b/src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java
index 0e049be7a5a..2ed40e877e3 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java
@@ -10,7 +10,7 @@ import forge.game.player.Player;
 
 public class ChooseTypeAi extends SpellAiLogic {
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         if (!params.containsKey("AILogic")) {
             return false;
         }
diff --git a/src/main/java/forge/card/abilityfactory/ai/ClashAi.java b/src/main/java/forge/card/abilityfactory/ai/ClashAi.java
index df2768968c1..8bf7c71d3f8 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ClashAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ClashAi.java
@@ -29,7 +29,7 @@ public class ClashAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
         final Player opp = ai.getOpponent();
         if (tgt != null) {
diff --git a/src/main/java/forge/card/abilityfactory/ai/CloneAi.java b/src/main/java/forge/card/abilityfactory/ai/CloneAi.java
index 756a4d46223..39cd7722456 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CloneAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CloneAi.java
@@ -16,7 +16,7 @@ import forge.game.player.Player;
 public class CloneAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
         final Card source = sa.getSourceCard();
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/ControlExchangeAi.java b/src/main/java/forge/card/abilityfactory/ai/ControlExchangeAi.java
index 2fd1e2b2012..b1766652106 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ControlExchangeAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ControlExchangeAi.java
@@ -22,7 +22,7 @@ public class ControlExchangeAi extends SpellAiLogic {
  * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
  */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, final SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, final SpellAbility sa) {
         Card object1 = null;
         Card object2 = null;
         final Target tgt = sa.getTarget();
diff --git a/src/main/java/forge/card/abilityfactory/ai/ControlGainAi.java b/src/main/java/forge/card/abilityfactory/ai/ControlGainAi.java
index dc9998e1047..7531e9bf1ac 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ControlGainAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ControlGainAi.java
@@ -62,7 +62,7 @@ import forge.game.zone.ZoneType;
  */
 public class ControlGainAi extends SpellAiLogic {
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, final SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, final SpellAbility sa) {
         boolean hasCreature = false;
         boolean hasArtifact = false;
         boolean hasEnchantment = false;
diff --git a/src/main/java/forge/card/abilityfactory/ai/CopyPermanentAi.java b/src/main/java/forge/card/abilityfactory/ai/CopyPermanentAi.java
index ad4299b35b5..7a18ef58f14 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CopyPermanentAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CopyPermanentAi.java
@@ -24,7 +24,7 @@ public class CopyPermanentAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         // Card source = sa.getSourceCard();
         // TODO - I'm sure someone can do this AI better
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/CounterAi.java b/src/main/java/forge/card/abilityfactory/ai/CounterAi.java
index dc0f6f87489..57bbfdf9941 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CounterAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CounterAi.java
@@ -17,7 +17,7 @@ import forge.util.MyRandom;
 public class CounterAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         boolean toReturn = true;
         final Cost abCost = sa.getAbilityFactory().getAbCost();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/CountersMoveAi.java b/src/main/java/forge/card/abilityfactory/ai/CountersMoveAi.java
index 421a2210762..562a347cb8f 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CountersMoveAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CountersMoveAi.java
@@ -18,7 +18,7 @@ import forge.util.MyRandom;
 
 public class CountersMoveAi extends SpellAiLogic { 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // AI needs to be expanded, since this function can be pretty complex
         // based on what
         // the expected targets could be
diff --git a/src/main/java/forge/card/abilityfactory/ai/CountersProliferateAi.java b/src/main/java/forge/card/abilityfactory/ai/CountersProliferateAi.java
index de27a8ee01a..50b29b31477 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CountersProliferateAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CountersProliferateAi.java
@@ -17,7 +17,7 @@ import forge.game.zone.ZoneType;
 public class CountersProliferateAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         boolean chance = true;
         
         List<Card> cperms = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), new Predicate<Card>() {
diff --git a/src/main/java/forge/card/abilityfactory/ai/CountersPutAi.java b/src/main/java/forge/card/abilityfactory/ai/CountersPutAi.java
index 3995557f97f..e68f759bdcc 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CountersPutAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CountersPutAi.java
@@ -26,7 +26,7 @@ import forge.util.MyRandom;
 
 public class CountersPutAi extends SpellAiLogic { 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, final SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, final SpellAbility sa) {
         // AI needs to be expanded, since this function can be pretty complex
         // based on
         // what the expected targets could be
diff --git a/src/main/java/forge/card/abilityfactory/ai/CountersPutAllAi.java b/src/main/java/forge/card/abilityfactory/ai/CountersPutAllAi.java
index a55d6d8cb98..2593056e82e 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CountersPutAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CountersPutAllAi.java
@@ -23,8 +23,8 @@ import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
 public class CountersPutAllAi extends SpellAiLogic { 
-    @Override 
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    @Override
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // AI needs to be expanded, since this function can be pretty complex
         // based on what
         // the expected targets could be
diff --git a/src/main/java/forge/card/abilityfactory/ai/CountersRemoveAi.java b/src/main/java/forge/card/abilityfactory/ai/CountersRemoveAi.java
index 675ce6b0812..05821f654f4 100644
--- a/src/main/java/forge/card/abilityfactory/ai/CountersRemoveAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/CountersRemoveAi.java
@@ -17,7 +17,7 @@ import forge.util.MyRandom;
 public class CountersRemoveAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // AI needs to be expanded, since this function can be pretty complex
         // based on what
         // the expected targets could be
diff --git a/src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java b/src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java
index da38cc1a0b3..dc42306c200 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java
@@ -26,7 +26,7 @@ public class  DamageAllAi extends SpellAiLogic
 {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // AI needs to be expanded, since this function can be pretty complex
         // based on what the expected targets could be
         final Random r = MyRandom.getRandom();
diff --git a/src/main/java/forge/card/abilityfactory/ai/DamageDealAi.java b/src/main/java/forge/card/abilityfactory/ai/DamageDealAi.java
index ba8fa90b768..8d1714eb6d9 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DamageDealAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DamageDealAi.java
@@ -44,7 +44,7 @@ public class DamageDealAi extends DamageAiBase {
     }
 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
 
         final Cost abCost = sa.getAbilityFactory().getAbCost();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/DamageEachAi.java b/src/main/java/forge/card/abilityfactory/ai/DamageEachAi.java
index cd3fd97d9a5..3366b5e9005 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DamageEachAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DamageEachAi.java
@@ -13,7 +13,7 @@ public class DamageEachAi extends DamageAiBase {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
 
         if (tgt != null && sa.canTarget(ai.getOpponent())) {
diff --git a/src/main/java/forge/card/abilityfactory/ai/DamagePreventAi.java b/src/main/java/forge/card/abilityfactory/ai/DamagePreventAi.java
index a09253d8ec2..fe424d18f1e 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DamagePreventAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DamagePreventAi.java
@@ -27,7 +27,7 @@ public class DamagePreventAi extends SpellAiLogic {
     }
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Card hostCard = sa.getAbilityFactory().getHostCard();
         boolean chance = false;
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/DamagePreventAllAi.java b/src/main/java/forge/card/abilityfactory/ai/DamagePreventAllAi.java
index 58d258e37ed..c028d704107 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DamagePreventAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DamagePreventAllAi.java
@@ -25,7 +25,7 @@ public class DamagePreventAllAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Card hostCard = sa.getAbilityFactory().getHostCard();
         boolean chance = false;
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/DebuffAi.java b/src/main/java/forge/card/abilityfactory/ai/DebuffAi.java
index 7a837b382a5..ceb6092b8b3 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DebuffAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DebuffAi.java
@@ -28,7 +28,7 @@ public class DebuffAi extends SpellAiLogic {
     // *************************************************************************
 
     @Override
-    public boolean canPlayAI(final Player ai, final java.util.Map<String,String> params, final SpellAbility sa) {
+    protected boolean canPlayAI(final Player ai, final java.util.Map<String,String> params, final SpellAbility sa) {
         // if there is no target and host card isn't in play, don't activate
         final Card source = sa.getSourceCard();
         if ((sa.getTarget() == null) && !source.isInPlay()) {
diff --git a/src/main/java/forge/card/abilityfactory/ai/DebuffAllAi.java b/src/main/java/forge/card/abilityfactory/ai/DebuffAllAi.java
index 80d69b68686..85f4ef549b1 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DebuffAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DebuffAllAi.java
@@ -18,7 +18,7 @@ import forge.util.MyRandom;
 
 public class DebuffAllAi extends SpellAiLogic {
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         String valid = "";
         final Random r = MyRandom.getRandom();
         // final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/DelayedTriggerAi.java b/src/main/java/forge/card/abilityfactory/ai/DelayedTriggerAi.java
index 7bf523c0684..330cb8ee53d 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DelayedTriggerAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DelayedTriggerAi.java
@@ -35,7 +35,7 @@ public class DelayedTriggerAi extends SpellAiLogic {
     }
 
     @Override
-    public boolean canPlayAI(forge.game.player.Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(forge.game.player.Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         final String svarName = params.get("Execute");
         final SpellAbility trigsa = tempCreator.getAbility(sa.getAbilityFactory().getHostCard().getSVar(svarName), sa.getAbilityFactory().getHostCard());
         return trigsa.canPlayAI();
diff --git a/src/main/java/forge/card/abilityfactory/ai/DestroyAi.java b/src/main/java/forge/card/abilityfactory/ai/DestroyAi.java
index 2a3ccbb9876..890b2358501 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DestroyAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DestroyAi.java
@@ -37,7 +37,7 @@ public class DestroyAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         // AI needs to be expanded, since this function can be pretty complex
         // based on what the expected targets could be
         final Random r = MyRandom.getRandom();
diff --git a/src/main/java/forge/card/abilityfactory/ai/DestroyAllAi.java b/src/main/java/forge/card/abilityfactory/ai/DestroyAllAi.java
index e74d91446b2..fcd004251a3 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DestroyAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DestroyAllAi.java
@@ -79,7 +79,7 @@ public class DestroyAllAi extends SpellAiLogic {
     }
 
     @Override
-    public boolean canPlayAI(final Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(final Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // AI needs to be expanded, since this function can be pretty complex
         // based on what the expected targets could be
         final Random r = MyRandom.getRandom();
diff --git a/src/main/java/forge/card/abilityfactory/ai/DigAi.java b/src/main/java/forge/card/abilityfactory/ai/DigAi.java
index fa1defd2bd9..c666144c8cc 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DigAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DigAi.java
@@ -19,7 +19,7 @@ public class DigAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         double chance = .4; // 40 percent chance with instant speed stuff
         if (AbilityFactory.isSorcerySpeed(sa)) {
             chance = .667; // 66.7% chance for sorcery speed (since it will
diff --git a/src/main/java/forge/card/abilityfactory/ai/DigUntilAi.java b/src/main/java/forge/card/abilityfactory/ai/DigUntilAi.java
index 227aa0aaa30..e7a08ae2166 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DigUntilAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DigUntilAi.java
@@ -14,7 +14,7 @@ public class DigUntilAi extends SpellAiLogic {
     
 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         double chance = .4; // 40 percent chance with instant speed stuff
         if (AbilityFactory.isSorcerySpeed(sa)) {
             chance = .667; // 66.7% chance for sorcery speed (since it will
diff --git a/src/main/java/forge/card/abilityfactory/ai/DiscardAi.java b/src/main/java/forge/card/abilityfactory/ai/DiscardAi.java
index 0b3f5acc638..17b14fa3b20 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DiscardAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DiscardAi.java
@@ -21,7 +21,7 @@ import forge.util.MyRandom;
 public class DiscardAi extends SpellAiLogic {
 
     @Override
-    public boolean canPlayAI(Player ai, Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String,String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
         final Card source = sa.getSourceCard();
         final Cost abCost = sa.getPayCosts();
diff --git a/src/main/java/forge/card/abilityfactory/ai/DrainManaAi.java b/src/main/java/forge/card/abilityfactory/ai/DrainManaAi.java
index 309c56db7ed..4880b76d93f 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DrainManaAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DrainManaAi.java
@@ -15,7 +15,7 @@ import forge.util.MyRandom;
 public class DrainManaAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // AI cannot use this properly until he can use SAs during Humans turn
 
         final Target tgt = sa.getTarget();
diff --git a/src/main/java/forge/card/abilityfactory/ai/DrawAi.java b/src/main/java/forge/card/abilityfactory/ai/DrawAi.java
index 6451e59a54a..52bc90fbc77 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DrawAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DrawAi.java
@@ -48,7 +48,7 @@ public class DrawAi extends SpellAiLogic {
          * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
          */
         @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+        protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
 
         final Target tgt = sa.getTarget();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/EffectAi.java b/src/main/java/forge/card/abilityfactory/ai/EffectAi.java
index b65f89bca90..e725a9a7188 100644
--- a/src/main/java/forge/card/abilityfactory/ai/EffectAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/EffectAi.java
@@ -22,7 +22,7 @@ import forge.util.MyRandom;
 
 public class EffectAi extends SpellAiLogic {
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final GameState game = Singletons.getModel().getGame();
         final Random r = MyRandom.getRandom();
         boolean randomReturn = r.nextFloat() <= .6667;
diff --git a/src/main/java/forge/card/abilityfactory/ai/EndTurnAi.java b/src/main/java/forge/card/abilityfactory/ai/EndTurnAi.java
index c4f5dd5a726..fa46cd9c3d7 100644
--- a/src/main/java/forge/card/abilityfactory/ai/EndTurnAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/EndTurnAi.java
@@ -24,7 +24,7 @@ public class EndTurnAi extends SpellAiLogic  {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         return false;
     }
 }
diff --git a/src/main/java/forge/card/abilityfactory/ai/FightAi.java b/src/main/java/forge/card/abilityfactory/ai/FightAi.java
index 25e4af39a6c..df3cdd9b182 100644
--- a/src/main/java/forge/card/abilityfactory/ai/FightAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/FightAi.java
@@ -20,7 +20,7 @@ public class FightAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         Target tgt = sa.getTarget();
         tgt.resetTargets();
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/FogAi.java b/src/main/java/forge/card/abilityfactory/ai/FogAi.java
index 405ca633571..427f7e3d2b2 100644
--- a/src/main/java/forge/card/abilityfactory/ai/FogAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/FogAi.java
@@ -15,7 +15,7 @@ public class FogAi extends SpellAiLogic {
          * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
          */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         // AI should only activate this during Human's Declare Blockers phase
         if (Singletons.getModel().getGame().getPhaseHandler().isPlayerTurn(sa.getActivatingPlayer())) {
             return false;
diff --git a/src/main/java/forge/card/abilityfactory/ai/GameLossAi.java b/src/main/java/forge/card/abilityfactory/ai/GameLossAi.java
index dce18ce1c4a..38b23871b0b 100644
--- a/src/main/java/forge/card/abilityfactory/ai/GameLossAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/GameLossAi.java
@@ -7,7 +7,7 @@ import forge.game.player.Player;
 
 public class GameLossAi extends SpellAiLogic {
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Player opp = ai.getOpponent();
         if (opp.cantLose()) {
             return false;
diff --git a/src/main/java/forge/card/abilityfactory/ai/GameWinAi.java b/src/main/java/forge/card/abilityfactory/ai/GameWinAi.java
index bf4f0ff93bd..32416b0bafb 100644
--- a/src/main/java/forge/card/abilityfactory/ai/GameWinAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/GameWinAi.java
@@ -11,7 +11,7 @@ public class GameWinAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         if (ai.cantWin()) {
             return false;
         }
diff --git a/src/main/java/forge/card/abilityfactory/ai/LifeExchangeAi.java b/src/main/java/forge/card/abilityfactory/ai/LifeExchangeAi.java
index 3ef8f79506e..89287638ebc 100644
--- a/src/main/java/forge/card/abilityfactory/ai/LifeExchangeAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/LifeExchangeAi.java
@@ -20,7 +20,7 @@ public class LifeExchangeAi extends SpellAiLogic {
      * forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         final Random r = MyRandom.getRandom();
         final int myLife = aiPlayer.getLife();
         Player opponent = aiPlayer.getOpponent();
diff --git a/src/main/java/forge/card/abilityfactory/ai/LifeGainAi.java b/src/main/java/forge/card/abilityfactory/ai/LifeGainAi.java
index 0dd64d65908..730ee9bfd06 100644
--- a/src/main/java/forge/card/abilityfactory/ai/LifeGainAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/LifeGainAi.java
@@ -29,7 +29,7 @@ public class LifeGainAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.AbilityFactoryAlterLife.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         
         final Random r = MyRandom.getRandom();
         final Cost abCost = sa.getPayCosts();
diff --git a/src/main/java/forge/card/abilityfactory/ai/LifeLoseAi.java b/src/main/java/forge/card/abilityfactory/ai/LifeLoseAi.java
index cabf652b50d..8c90d0fec50 100644
--- a/src/main/java/forge/card/abilityfactory/ai/LifeLoseAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/LifeLoseAi.java
@@ -23,7 +23,7 @@ public class LifeLoseAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.AbilityFactoryAlterLife.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         
         final Random r = MyRandom.getRandom();
         final Cost abCost = sa.getPayCosts();
diff --git a/src/main/java/forge/card/abilityfactory/ai/LifeSetAi.java b/src/main/java/forge/card/abilityfactory/ai/LifeSetAi.java
index 0bc6f694325..1e922919b2c 100644
--- a/src/main/java/forge/card/abilityfactory/ai/LifeSetAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/LifeSetAi.java
@@ -18,7 +18,7 @@ import forge.util.MyRandom;
 public class LifeSetAi extends SpellAiLogic {
 
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Random r = MyRandom.getRandom();
         // Ability_Cost abCost = sa.getPayCosts();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/MillAi.java b/src/main/java/forge/card/abilityfactory/ai/MillAi.java
index 904d42977ce..ea86472454e 100644
--- a/src/main/java/forge/card/abilityfactory/ai/MillAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/MillAi.java
@@ -21,7 +21,7 @@ import forge.util.MyRandom;
 public class MillAi extends SpellAiLogic {
 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Card source = sa.getSourceCard();
         final Cost abCost = sa.getPayCosts();
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/MustAttackAi.java b/src/main/java/forge/card/abilityfactory/ai/MustAttackAi.java
index bdee97a9d95..0598df7b063 100644
--- a/src/main/java/forge/card/abilityfactory/ai/MustAttackAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/MustAttackAi.java
@@ -9,7 +9,7 @@ import forge.game.player.Player;
 public class MustAttackAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         // disabled for the AI for now. Only for Gideon Jura at this time.
         return false;
     }
diff --git a/src/main/java/forge/card/abilityfactory/ai/MustBlockAi.java b/src/main/java/forge/card/abilityfactory/ai/MustBlockAi.java
index 2131865e625..a5d91e68aea 100644
--- a/src/main/java/forge/card/abilityfactory/ai/MustBlockAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/MustBlockAi.java
@@ -22,7 +22,7 @@ import forge.game.zone.ZoneType;
 public class MustBlockAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         // disabled for the AI until he/she can make decisions about who to make
         // block
         return false;
diff --git a/src/main/java/forge/card/abilityfactory/ai/PhasesAi.java b/src/main/java/forge/card/abilityfactory/ai/PhasesAi.java
index 605a013a9c5..a8083626851 100644
--- a/src/main/java/forge/card/abilityfactory/ai/PhasesAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/PhasesAi.java
@@ -22,7 +22,7 @@ public class PhasesAi extends SpellAiLogic
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         // This still needs to be fleshed out
         final Target tgt = sa.getTarget();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/PlayAi.java b/src/main/java/forge/card/abilityfactory/ai/PlayAi.java
index 70ed479d94f..d875f5667d8 100644
--- a/src/main/java/forge/card/abilityfactory/ai/PlayAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/PlayAi.java
@@ -30,7 +30,7 @@ public class PlayAi extends SpellAiLogic {
     }
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Cost abCost = sa.getAbilityFactory().getAbCost();
         final Card source = sa.getAbilityFactory().getHostCard();
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/PoisonAi.java b/src/main/java/forge/card/abilityfactory/ai/PoisonAi.java
index 178293e2cb4..d32b5775c87 100644
--- a/src/main/java/forge/card/abilityfactory/ai/PoisonAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/PoisonAi.java
@@ -26,7 +26,7 @@ public class PoisonAi extends SpellAiLogic {
      * forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Cost abCost = sa.getPayCosts();
         final Card source = sa.getSourceCard();
         // int humanPoison = AllZone.getHumanPlayer().getPoisonCounters();
diff --git a/src/main/java/forge/card/abilityfactory/ai/ProtectAi.java b/src/main/java/forge/card/abilityfactory/ai/ProtectAi.java
index d40ba6fd0ae..a8cfb171668 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ProtectAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ProtectAi.java
@@ -110,7 +110,7 @@ public class ProtectAi extends SpellAiLogic {
     } // getProtectCreatures()
 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Card hostCard = sa.getAbilityFactory().getHostCard();
         // if there is no target and host card isn't in play, don't activate
         if ((sa.getTarget() == null) && !hostCard.isInPlay()) {
diff --git a/src/main/java/forge/card/abilityfactory/ai/ProtectAllAi.java b/src/main/java/forge/card/abilityfactory/ai/ProtectAllAi.java
index e5f16389a3f..d4ed838cbbf 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ProtectAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ProtectAllAi.java
@@ -12,7 +12,7 @@ import forge.game.player.Player;
 public class ProtectAllAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Card hostCard = sa.getAbilityFactory().getHostCard();
         // if there is no target and host card isn't in play, don't activate
         if ((sa.getTarget() == null) && !hostCard.isInPlay()) {
diff --git a/src/main/java/forge/card/abilityfactory/ai/PumpAi.java b/src/main/java/forge/card/abilityfactory/ai/PumpAi.java
index 6033aedb995..b2fd1608e32 100644
--- a/src/main/java/forge/card/abilityfactory/ai/PumpAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/PumpAi.java
@@ -30,7 +30,7 @@ public class PumpAi extends PumpAiBase {
          * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
          */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Cost cost = sa.getPayCosts();
         final PhaseHandler ph = Singletons.getModel().getGame().getPhaseHandler();
         final List<String> keywords = params.containsKey("KW") ? Arrays.asList(params.get("KW").split(" & ")) : new ArrayList<String>();
diff --git a/src/main/java/forge/card/abilityfactory/ai/PumpAllAi.java b/src/main/java/forge/card/abilityfactory/ai/PumpAllAi.java
index c8205e258a3..2fd24c76760 100644
--- a/src/main/java/forge/card/abilityfactory/ai/PumpAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/PumpAllAi.java
@@ -26,7 +26,7 @@ public class PumpAllAi extends PumpAiBase {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(final Player ai, Map<String, String> params, final SpellAbility sa) {
+    protected boolean canPlayAI(final Player ai, Map<String, String> params, final SpellAbility sa) {
         String valid = "";
         final Card source = sa.getSourceCard();
         
diff --git a/src/main/java/forge/card/abilityfactory/ai/RearrangeTopOfLibraryAi.java b/src/main/java/forge/card/abilityfactory/ai/RearrangeTopOfLibraryAi.java
index 11ab730d767..a35fdb24bce 100644
--- a/src/main/java/forge/card/abilityfactory/ai/RearrangeTopOfLibraryAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/RearrangeTopOfLibraryAi.java
@@ -12,7 +12,7 @@ public class RearrangeTopOfLibraryAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         return false;
     }
     
diff --git a/src/main/java/forge/card/abilityfactory/ai/RegenerateAi.java b/src/main/java/forge/card/abilityfactory/ai/RegenerateAi.java
index 59c6ab6d768..971edd91b43 100644
--- a/src/main/java/forge/card/abilityfactory/ai/RegenerateAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/RegenerateAi.java
@@ -56,7 +56,7 @@ public class RegenerateAi extends SpellAiLogic {
     // **************************************************************
 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Card hostCard = sa.getAbilityFactory().getHostCard();
         boolean chance = false;
         final Cost abCost = sa.getAbilityFactory().getAbCost();
diff --git a/src/main/java/forge/card/abilityfactory/ai/RegenerateAllAi.java b/src/main/java/forge/card/abilityfactory/ai/RegenerateAllAi.java
index 15e51e443f7..be8875be1e0 100644
--- a/src/main/java/forge/card/abilityfactory/ai/RegenerateAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/RegenerateAllAi.java
@@ -20,7 +20,7 @@ import forge.game.zone.ZoneType;
 public class RegenerateAllAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Card hostCard = sa.getAbilityFactory().getHostCard();
         boolean chance = false;
         final Cost abCost = sa.getAbilityFactory().getAbCost();
diff --git a/src/main/java/forge/card/abilityfactory/ai/RemoveFromCombatAi.java b/src/main/java/forge/card/abilityfactory/ai/RemoveFromCombatAi.java
index bd3c7e53728..2b7f458ebde 100644
--- a/src/main/java/forge/card/abilityfactory/ai/RemoveFromCombatAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/RemoveFromCombatAi.java
@@ -9,7 +9,7 @@ import forge.game.player.Player;
 public class RemoveFromCombatAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         // disabled for the AI for now. Only for Gideon Jura at this time.
         return false;
     }
diff --git a/src/main/java/forge/card/abilityfactory/ai/RepeatAi.java b/src/main/java/forge/card/abilityfactory/ai/RepeatAi.java
index 8019eda3cbf..d0e511b1c19 100644
--- a/src/main/java/forge/card/abilityfactory/ai/RepeatAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/RepeatAi.java
@@ -10,7 +10,7 @@ import forge.game.player.Player;
 public class RepeatAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
         final Player opp = ai.getOpponent();
         if (tgt != null) {
diff --git a/src/main/java/forge/card/abilityfactory/ai/RestartGameAi.java b/src/main/java/forge/card/abilityfactory/ai/RestartGameAi.java
index d8e59085b0f..192ffface41 100644
--- a/src/main/java/forge/card/abilityfactory/ai/RestartGameAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/RestartGameAi.java
@@ -16,7 +16,7 @@ public class RestartGameAi extends SpellAiLogic {
      * forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         // The only card that uses this is Karn Liberated
         
         // TODO Add Logic, check if AI is losing game state, or life
diff --git a/src/main/java/forge/card/abilityfactory/ai/RevealAi.java b/src/main/java/forge/card/abilityfactory/ai/RevealAi.java
index f77fee34e5d..9928813d90d 100644
--- a/src/main/java/forge/card/abilityfactory/ai/RevealAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/RevealAi.java
@@ -12,7 +12,7 @@ import forge.util.MyRandom;
 
 public class RevealAi extends RevealAiBase {
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // AI cannot use this properly until he can use SAs during Humans turn
         final Cost abCost = sa.getPayCosts();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/RevealHandAi.java b/src/main/java/forge/card/abilityfactory/ai/RevealHandAi.java
index ecee37065bf..de746b0c9b9 100644
--- a/src/main/java/forge/card/abilityfactory/ai/RevealHandAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/RevealHandAi.java
@@ -17,7 +17,7 @@ public class RevealHandAi extends RevealAiBase {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         // AI cannot use this properly until he can use SAs during Humans turn
         final Cost abCost = sa.getPayCosts();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/SacrificeAi.java b/src/main/java/forge/card/abilityfactory/ai/SacrificeAi.java
index e70f142b6cf..bf9baa4083b 100644
--- a/src/main/java/forge/card/abilityfactory/ai/SacrificeAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/SacrificeAi.java
@@ -20,7 +20,7 @@ public class SacrificeAi extends SpellAiLogic {
     // **************************************************************
 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         boolean chance = sacrificeTgtAI(ai, params, sa);
 
         // Some additional checks based on what is being sacrificed, and who is
diff --git a/src/main/java/forge/card/abilityfactory/ai/SacrificeAllAi.java b/src/main/java/forge/card/abilityfactory/ai/SacrificeAllAi.java
index fc3962f9e4c..cc001790412 100644
--- a/src/main/java/forge/card/abilityfactory/ai/SacrificeAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/SacrificeAllAi.java
@@ -18,7 +18,7 @@ import forge.util.MyRandom;
 public class SacrificeAllAi extends SpellAiLogic
 {
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // AI needs to be expanded, since this function can be pretty complex
         // based on what the expected targets could be
         final Random r = MyRandom.getRandom();
diff --git a/src/main/java/forge/card/abilityfactory/ai/ScryAi.java b/src/main/java/forge/card/abilityfactory/ai/ScryAi.java
index e4e53088ba7..074630629dc 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ScryAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ScryAi.java
@@ -36,7 +36,7 @@ public class ScryAi extends SpellAiLogic {
     
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         // Card source = sa.getSourceCard();
     
         double chance = .4; // 40 percent chance of milling with instant speed
diff --git a/src/main/java/forge/card/abilityfactory/ai/SetStateAi.java b/src/main/java/forge/card/abilityfactory/ai/SetStateAi.java
index 3e38065e91b..df455f71b96 100644
--- a/src/main/java/forge/card/abilityfactory/ai/SetStateAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/SetStateAi.java
@@ -8,7 +8,7 @@ import forge.game.player.Player;
 
 public class SetStateAi extends SpellAiLogic {
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         return false;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/SetStateAllAi.java b/src/main/java/forge/card/abilityfactory/ai/SetStateAllAi.java
index 7a7938cf2ce..6b0c4bbf641 100644
--- a/src/main/java/forge/card/abilityfactory/ai/SetStateAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/SetStateAllAi.java
@@ -11,7 +11,7 @@ public class SetStateAllAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, Map<String, String> params, SpellAbility sa) {
         return true;
     }
     
diff --git a/src/main/java/forge/card/abilityfactory/ai/ShuffleAi.java b/src/main/java/forge/card/abilityfactory/ai/ShuffleAi.java
index 1f98c41c743..3f622f11114 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ShuffleAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ShuffleAi.java
@@ -6,7 +6,7 @@ import forge.game.player.Player;
 
 public class ShuffleAi extends SpellAiLogic {
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         // not really sure when the compy would use this; maybe only after a
         // human
         // deliberately put a card on top of their library
diff --git a/src/main/java/forge/card/abilityfactory/ai/StoreSVarAi.java b/src/main/java/forge/card/abilityfactory/ai/StoreSVarAi.java
index 7b353b3dce9..a3c7d71edb0 100644
--- a/src/main/java/forge/card/abilityfactory/ai/StoreSVarAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/StoreSVarAi.java
@@ -11,7 +11,7 @@ import forge.game.player.Player;
 public class StoreSVarAi extends SpellAiLogic {
     
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         //Tree of Redemption
 
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/TapAi.java b/src/main/java/forge/card/abilityfactory/ai/TapAi.java
index 570acf833ea..3d18dd076c1 100644
--- a/src/main/java/forge/card/abilityfactory/ai/TapAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/TapAi.java
@@ -15,7 +15,7 @@ import forge.util.MyRandom;
 
 public class TapAi extends TapAiBase {
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
         final Card source = sa.getSourceCard();
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/TapAllAi.java b/src/main/java/forge/card/abilityfactory/ai/TapAllAi.java
index ec164819378..0060de45d17 100644
--- a/src/main/java/forge/card/abilityfactory/ai/TapAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/TapAllAi.java
@@ -24,7 +24,7 @@ public class TapAllAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(final Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(final Player ai, Map<String, String> params, SpellAbility sa) {
         // If tapping all creatures do it either during declare attackers of AIs
         // turn
         // or during upkeep/begin combat?
diff --git a/src/main/java/forge/card/abilityfactory/ai/TapOrUntapAi.java b/src/main/java/forge/card/abilityfactory/ai/TapOrUntapAi.java
index 54c303c91e1..013efac59f0 100644
--- a/src/main/java/forge/card/abilityfactory/ai/TapOrUntapAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/TapOrUntapAi.java
@@ -17,7 +17,7 @@ public class TapOrUntapAi extends TapAiBase {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
         final Card source = sa.getSourceCard();
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/TokenAi.java b/src/main/java/forge/card/abilityfactory/ai/TokenAi.java
index 73c664e170b..2fb7d944f11 100644
--- a/src/main/java/forge/card/abilityfactory/ai/TokenAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/TokenAi.java
@@ -64,7 +64,7 @@ public class TokenAi extends SpellAiLogic {
     }
 
     @Override
-    public boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, java.util.Map<String,String> params, SpellAbility sa) {
         final Cost cost = sa.getPayCosts();
         readParameters(params);
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/TwoPilesAi.java b/src/main/java/forge/card/abilityfactory/ai/TwoPilesAi.java
index 74f183707be..222ed0b5c34 100644
--- a/src/main/java/forge/card/abilityfactory/ai/TwoPilesAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/TwoPilesAi.java
@@ -19,7 +19,7 @@ public class TwoPilesAi extends SpellAiLogic  {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Card card = sa.getSourceCard();
         ZoneType zone = null;
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/UnattachAllAi.java b/src/main/java/forge/card/abilityfactory/ai/UnattachAllAi.java
index fdd91f84ed1..14c171732c5 100644
--- a/src/main/java/forge/card/abilityfactory/ai/UnattachAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/UnattachAllAi.java
@@ -24,7 +24,7 @@ public class UnattachAllAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Random r = MyRandom.getRandom();
         final Cost abCost = sa.getPayCosts();
         final Card source = sa.getSourceCard();
diff --git a/src/main/java/forge/card/abilityfactory/ai/UntapAi.java b/src/main/java/forge/card/abilityfactory/ai/UntapAi.java
index b5dd0cb8707..5fde057b7f7 100644
--- a/src/main/java/forge/card/abilityfactory/ai/UntapAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/UntapAi.java
@@ -27,7 +27,7 @@ public class UntapAi extends SpellAiLogic {
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    public boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player ai, Map<String, String> params, SpellAbility sa) {
         final Target tgt = sa.getTarget();
         final Card source = sa.getSourceCard();
         final Cost cost = sa.getPayCosts();
diff --git a/src/main/java/forge/card/abilityfactory/ai/UntapAllAi.java b/src/main/java/forge/card/abilityfactory/ai/UntapAllAi.java
index e000a201807..c2381cfb565 100644
--- a/src/main/java/forge/card/abilityfactory/ai/UntapAllAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/UntapAllAi.java
@@ -13,7 +13,7 @@ public class UntapAllAi extends SpellAiLogic {
     }
 
     @Override
-    public boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
+    protected boolean canPlayAI(Player aiPlayer, java.util.Map<String,String> params, SpellAbility sa) {
         // check SubAbilities DoTrigger?
         final AbilitySub abSub = sa.getSubAbility();
         if (abSub != null) {
diff --git a/src/main/java/forge/game/player/ComputerUtilAttack.java b/src/main/java/forge/game/player/ComputerUtilAttack.java
index 4a46a093ca3..1134d9377c9 100644
--- a/src/main/java/forge/game/player/ComputerUtilAttack.java
+++ b/src/main/java/forge/game/player/ComputerUtilAttack.java
@@ -79,7 +79,7 @@ public class ComputerUtilAttack {
 
         this.attackers = new ArrayList<Card>();
         for(Card c : computerList) 
-            if (CombatUtil.canAttack(c, human))
+            if (CombatUtil.canAttack(c, (GameEntity)human))
                 attackers.add(c);
         
         this.blockers = this.getPossibleBlockers(humanList, this.attackers);