diff --git a/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java b/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java
index b2a3a682f4..c05a1cf39b 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java
@@ -28,29 +28,22 @@
 package mage.sets.alarareborn;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.common.AsEntersBattlefieldAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl;
-import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.NameACardEffect;
 import mage.cards.CardImpl;
-import mage.cards.repository.CardRepository;
-import mage.choices.Choice;
-import mage.choices.ChoiceImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.permanent.Permanent;
-import mage.players.Player;
-import mage.util.CardUtil;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java
index 6614ba2dc9..8e76586676 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java
@@ -137,13 +137,16 @@ class SpiritOfTheLabyrinthEffect extends ContinuousRuleModifiyingEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.DRAW_CARD;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.DRAW_CARD) {
-            SpiritOfTheLabyrinthWatcher watcher = (SpiritOfTheLabyrinthWatcher) game.getState().getWatchers().get("DrewCard");
-            if (watcher != null && watcher.hasPlayerDrewCardThisTurn(event.getPlayerId())) {
-                return true;
-            }
+        SpiritOfTheLabyrinthWatcher watcher = (SpiritOfTheLabyrinthWatcher) game.getState().getWatchers().get("DrewCard");
+        if (watcher != null && watcher.hasPlayerDrewCardThisTurn(event.getPlayerId())) {
+            return true;
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/sets/commander/AkromaAngelOfFury.java b/Mage.Sets/src/mage/sets/commander/AkromaAngelOfFury.java
index 4b30fce97b..d1df42ce6c 100644
--- a/Mage.Sets/src/mage/sets/commander/AkromaAngelOfFury.java
+++ b/Mage.Sets/src/mage/sets/commander/AkromaAngelOfFury.java
@@ -65,7 +65,6 @@ public class AkromaAngelOfFury extends CardImpl {
         this.supertype.add("Legendary");
         this.subtype.add("Angel");
 
-        this.color.setRed(true);
         this.power = new MageInt(6);
         this.toughness = new MageInt(6);
 
diff --git a/Mage.Sets/src/mage/sets/commander2014/WakeTheDead.java b/Mage.Sets/src/mage/sets/commander2014/WakeTheDead.java
index d588f1df4d..5a22ffff0b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/WakeTheDead.java
+++ b/Mage.Sets/src/mage/sets/commander2014/WakeTheDead.java
@@ -106,9 +106,14 @@ class WakeTheDeadEffect extends ContinuousRuleModifiyingEffectImpl {
         super(effect);
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType().equals(GameEvent.EventType.CAST_SPELL) && event.getSourceId().equals(source.getSourceId())) {
+        if (event.getSourceId().equals(source.getSourceId())) {
             if (game.getPhase().getType().equals(TurnPhase.COMBAT)) {
                 return !game.getOpponents(source.getControllerId()).contains(game.getActivePlayerId());
             }
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java b/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java
index 4f480c3621..861293bbee 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java
@@ -29,11 +29,6 @@
 package mage.sets.dragonsmaze;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.MageObject;
 import mage.abilities.Ability;
@@ -41,21 +36,20 @@ import mage.abilities.SpellAbility;
 import mage.abilities.common.AsEntersBattlefieldAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl;
-import mage.abilities.effects.common.cost.CostModificationEffectImpl;
-import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.NameACardEffect;
+import mage.abilities.effects.common.cost.CostModificationEffectImpl;
 import mage.abilities.keyword.FlashbackAbility;
 import mage.cards.Card;
 import mage.cards.CardImpl;
-import mage.cards.repository.CardRepository;
-import mage.choices.Choice;
-import mage.choices.ChoiceImpl;
+import mage.constants.CardType;
 import mage.constants.CostModificationType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.permanent.Permanent;
-import mage.players.Player;
 import mage.util.CardUtil;
 
 /**
@@ -83,7 +77,6 @@ public class CouncilOfTheAbsolute extends CardImpl {
         // Spells with the chosen name cost 2 less for you to cast.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CouncilOfTheAbsoluteCostReductionEffect()));
 
-
     }
 
     public CouncilOfTheAbsolute (final CouncilOfTheAbsolute card) {
@@ -127,9 +120,14 @@ class CouncilOfTheAbsoluteReplacementEffect extends ContinuousRuleModifiyingEffe
         return null;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.CAST_SPELL && game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
+        if (game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
             MageObject object = game.getObject(event.getSourceId());
             if (object != null && object.getName().equals(game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY))) {
                 return true;
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java b/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java
index d78f7383bb..74a0bacd07 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java
@@ -146,13 +146,16 @@ class RenderSilentEffect extends ContinuousRuleModifiyingEffectImpl {
         return null;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.CAST_SPELL ) {
-            Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
-            if (player != null && player.getId().equals(event.getPlayerId())) {
-                return true;
-            }
+        Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
+        if (player != null && player.getId().equals(event.getPlayerId())) {
+            return true;
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/sets/eventide/Moonhold.java b/Mage.Sets/src/mage/sets/eventide/Moonhold.java
index f2fff80e21..4279bb178e 100644
--- a/Mage.Sets/src/mage/sets/eventide/Moonhold.java
+++ b/Mage.Sets/src/mage/sets/eventide/Moonhold.java
@@ -110,15 +110,19 @@ class MoonholdEffect extends ContinuousRuleModifiyingEffectImpl {
     public String getInfoMessage(Ability source, GameEvent event, Game game) {
         MageObject mageObject = game.getObject(source.getSourceId());
         if (mageObject != null) {
-            return "You can't play land cards this turn (" + mageObject.getLogName() + ").";
+            return "you can't play land cards this turn (" + mageObject.getLogName() + ").";
         }
         return null;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.PLAY_LAND;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.PLAY_LAND
-                && event.getPlayerId().equals(source.getFirstTarget())) {
+        if (event.getPlayerId().equals(source.getFirstTarget())) {
             return true;
         }
         return false;
@@ -154,10 +158,14 @@ class MoonholdEffect2 extends ContinuousRuleModifiyingEffectImpl {
         return null;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.CAST_SPELL
-                && event.getPlayerId().equals(source.getFirstTarget())) {
+        if (event.getPlayerId().equals(source.getFirstTarget())) {
             Card card = game.getCard(event.getSourceId());
             if (card != null && card.getCardType().contains(CardType.CREATURE)) {
                 return true;
diff --git a/Mage.Sets/src/mage/sets/fatereforged/HewedStoneRetainers.java b/Mage.Sets/src/mage/sets/fatereforged/HewedStoneRetainers.java
index 235cdd2350..e93d63247a 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/HewedStoneRetainers.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/HewedStoneRetainers.java
@@ -79,9 +79,14 @@ class HewedStoneRetainersEffect extends ContinuousRuleModifiyingEffectImpl {
        super(effect);
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-       if (event.getType() == GameEvent.EventType.CAST_SPELL && event.getSourceId().equals(source.getSourceId())) {
+       if (event.getSourceId().equals(source.getSourceId())) {
            CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get("CastSpellLastTurnWatcher");
            if (watcher != null && watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(source.getControllerId()) == 0) {
                return true;
diff --git a/Mage.Sets/src/mage/sets/fatereforged/WardscaleDragon.java b/Mage.Sets/src/mage/sets/fatereforged/WardscaleDragon.java
index 51b44ea2d5..2ef467bd77 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/WardscaleDragon.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/WardscaleDragon.java
@@ -96,13 +96,16 @@ class WardscaleDragonRuleEffect extends ContinuousRuleModifiyingEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.CAST_SPELL ) {
-            Permanent sourcePermanent = game.getPermanent(source.getSourceId());
-            if (sourcePermanent != null && sourcePermanent.isAttacking()) {
-                return event.getPlayerId() == game.getCombat().getDefendingPlayerId(sourcePermanent.getId(), game);                
-            }
+        Permanent sourcePermanent = game.getPermanent(source.getSourceId());
+        if (sourcePermanent != null && sourcePermanent.isAttacking()) {
+            return event.getPlayerId() == game.getCombat().getDefendingPlayerId(sourcePermanent.getId(), game);                
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/sets/fatereforged/WildSlash.java b/Mage.Sets/src/mage/sets/fatereforged/WildSlash.java
index f27ccc2cb5..475556f1bf 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/WildSlash.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/WildSlash.java
@@ -81,7 +81,7 @@ class DamageCantBePreventedEffect extends ContinuousRuleModifiyingEffectImpl {
 
     public DamageCantBePreventedEffect() {
         super(Duration.EndOfTurn, Outcome.Benefit, false, false);
-        staticText = "Damage can't be prevented this turn";
+        staticText = "damage can't be prevented this turn";
     }
 
     public DamageCantBePreventedEffect(final DamageCantBePreventedEffect effect) {
@@ -98,11 +98,13 @@ class DamageCantBePreventedEffect extends ContinuousRuleModifiyingEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.PREVENT_DAMAGE;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType().equals(GameEvent.EventType.PREVENT_DAMAGE)) {
-            return true;
-        }
-        return false;
+        return true;
     }
 }
diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java
index 96690bbdbb..735e1ca769 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java
@@ -182,9 +182,14 @@ class AngelicArbiterEffect2 extends ContinuousRuleModifiyingEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.CAST_SPELL && game.getActivePlayerId().equals(event.getPlayerId()) && game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
+        if (game.getActivePlayerId().equals(event.getPlayerId()) && game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
             AngelicArbiterWatcher2 watcher = (AngelicArbiterWatcher2) game.getState().getWatchers().get("PlayerAttacked");
             if (watcher != null && watcher.hasPlayerAttackedThisTurn(event.getPlayerId())) {
                 return true;
diff --git a/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java b/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java
index 3c909a8378..71c982f9c2 100644
--- a/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java
+++ b/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java
@@ -97,9 +97,14 @@ class AggressiveMiningEffect extends ContinuousRuleModifiyingEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.PLAY_LAND;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        return event.getType().equals(GameEvent.EventType.PLAY_LAND) && event.getPlayerId().equals(source.getControllerId());
+        return event.getPlayerId().equals(source.getControllerId());
     }
     
 }
diff --git a/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java b/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java
index 6ec1eb2247..d369e393d8 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java
@@ -99,17 +99,20 @@ class HushwingGryffEffect extends ContinuousRuleModifiyingEffectImpl {
         }
         return null;
     }
+    
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;
+    }
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
-            Permanent permanent = ((EntersTheBattlefieldEvent)event).getTarget();
-            if (permanent != null && permanent.getCardType().contains(CardType.CREATURE)) {
-                // Because replacement events have to be executed 
-                // call replaceEvent here without calling the triggering event after
-                game.getContinuousEffects().replaceEvent(event, game);
-                return true;
-            }
+        Permanent permanent = ((EntersTheBattlefieldEvent)event).getTarget();
+        if (permanent != null && permanent.getCardType().contains(CardType.CREATURE)) {
+            // Because replacement events have to be executed 
+            // call replaceEvent here without calling the triggering event after
+            game.getContinuousEffects().replaceEvent(event, game);
+            return true;
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java
index e0ac8ec6d3..544ef24b03 100644
--- a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java
+++ b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java
@@ -110,9 +110,14 @@ class CeaseFireEffect extends ContinuousRuleModifiyingEffectImpl {
         return null;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.CAST_SPELL && event.getPlayerId().equals(source.getFirstTarget())) {
+        if (event.getPlayerId().equals(source.getFirstTarget())) {
             MageObject object = game.getObject(event.getSourceId());
             if (filter.match((Spell) object, game)) {
                 return true;
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java b/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java
index e21a64d9b9..4e3d3dab2a 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SupremeVerdict.java
@@ -30,12 +30,12 @@ package mage.sets.returntoravnica;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.CantCounterAbility;
+import mage.abilities.common.CantBeCounteredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.Effect;
 import mage.constants.CardType;
 import mage.constants.Rarity;
-import mage.abilities.effects.common.CantCounterSourceEffect;
+import mage.abilities.effects.common.CantBeCounteredSourceEffect;
 import mage.abilities.effects.common.DestroyAllEffect;
 import mage.cards.CardImpl;
 import mage.constants.Zone;
@@ -55,7 +55,7 @@ public class SupremeVerdict extends CardImpl {
         this.color.setBlue(true);
 
         // Supreme Verdict can't be countered.
-        Ability ability = new CantCounterAbility();
+        Ability ability = new CantBeCounteredAbility();
         ability.setRuleAtTheTop(true);
         this.addAbility(ability);
 
diff --git a/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java b/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java
index ef8da56be5..2939a3cc57 100644
--- a/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java
+++ b/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java
@@ -129,13 +129,16 @@ class XantidSwarmReplacementEffect extends ContinuousRuleModifiyingEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.CAST_SPELL ) {
-            Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
-            if (player != null && player.getId().equals(event.getPlayerId())) {
-                return true;
-            }
+        Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
+        if (player != null && player.getId().equals(event.getPlayerId())) {
+            return true;
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java b/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java
index 2f5066eafb..604e9dc16f 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java
@@ -111,9 +111,14 @@ class VexingShusherCantCounterTargetEffect extends ContinuousRuleModifiyingEffec
         return null;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.COUNTER;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        return event.getType() == EventType.COUNTER && event.getTargetId().equals(targetPointer.getFirst(game, source));
+        return event.getTargetId().equals(targetPointer.getFirst(game, source));
     }
 
 }
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java
index 1bcb3c3e10..e3e773bbac 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java
@@ -144,14 +144,17 @@ class EtherswornCanonistReplacementEffect extends ContinuousRuleModifiyingEffect
         return new EtherswornCanonistReplacementEffect(this);
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.CAST_SPELL) {
-            EtherswornCanonistWatcher watcher = (EtherswornCanonistWatcher)game.getState().getWatchers().get("EtherswornCanonistWatcher");
-            Card card = game.getCard(event.getSourceId());
-            if (card != null && !card.getCardType().contains(CardType.ARTIFACT) && watcher.castNonArtifactSpell(event.getPlayerId())) {  
-                return true;
-            }
+        EtherswornCanonistWatcher watcher = (EtherswornCanonistWatcher)game.getState().getWatchers().get("EtherswornCanonistWatcher");
+        Card card = game.getCard(event.getSourceId());
+        if (card != null && !card.getCardType().contains(CardType.ARTIFACT) && watcher.castNonArtifactSpell(event.getPlayerId())) {  
+            return true;
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/sets/tenth/Incinerate.java b/Mage.Sets/src/mage/sets/tenth/Incinerate.java
index 2a74ae3db2..ceef626402 100644
--- a/Mage.Sets/src/mage/sets/tenth/Incinerate.java
+++ b/Mage.Sets/src/mage/sets/tenth/Incinerate.java
@@ -91,13 +91,16 @@ class IncinerateEffect extends ContinuousRuleModifiyingEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.REGENERATE;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.REGENERATE) {
-            DamagedByWatcher watcher = (DamagedByWatcher) game.getState().getWatchers().get("DamagedByWatcher", source.getSourceId());
-            if (watcher != null) {
-                return watcher.wasDamaged(event.getTargetId(), game);
-            }
+        DamagedByWatcher watcher = (DamagedByWatcher) game.getState().getWatchers().get("DamagedByWatcher", source.getSourceId());
+        if (watcher != null) {
+            return watcher.wasDamaged(event.getTargetId(), game);
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java
index 0b15bba1cc..66afe5c6b4 100644
--- a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java
+++ b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java
@@ -28,19 +28,13 @@
 package mage.sets.theros;
 
 import java.util.UUID;
-import mage.abilities.Ability;
-import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.keyword.ScryEffect;
 import mage.abilities.effects.common.ruleModifying.CantRegenerateTargetEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
-import mage.constants.Outcome;
 import mage.constants.Rarity;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
 import mage.target.common.TargetCreaturePermanent;
 import mage.watchers.common.DamagedByWatcher;
 
diff --git a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java
index 39a92dc639..a62a31ad8b 100644
--- a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java
+++ b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java
@@ -105,6 +105,13 @@ class ShipbreakerKrakenReplacementEffect extends ContinuousRuleModifiyingEffectI
         return false;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.LOST_CONTROL ||
+               event.getType() == GameEvent.EventType.ZONE_CHANGE ||
+               event.getType() == GameEvent.EventType.UNTAP;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         // Source must be on the battlefield (it's neccessary to check here because if as response to the enter
diff --git a/Mage.Sets/src/mage/sets/theros/UnderworldCerberus.java b/Mage.Sets/src/mage/sets/theros/UnderworldCerberus.java
index fcf12ad5d3..bc4955e92b 100644
--- a/Mage.Sets/src/mage/sets/theros/UnderworldCerberus.java
+++ b/Mage.Sets/src/mage/sets/theros/UnderworldCerberus.java
@@ -105,16 +105,19 @@ class UnderworldCerberusEffect extends ContinuousRuleModifiyingEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.TARGET;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.TARGET) {
-            Card targetCard = game.getCard(event.getTargetId());
-            StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
-            if (targetCard != null && stackObject != null) {
-                Zone zone = game.getState().getZone(targetCard.getId());
-                if (zone != null && (zone == Zone.GRAVEYARD)) {
-                    return true;
-                }
+        Card targetCard = game.getCard(event.getTargetId());
+        StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
+        if (targetCard != null && stackObject != null) {
+            Zone zone = game.getState().getZone(targetCard.getId());
+            if (zone != null && (zone == Zone.GRAVEYARD)) {
+                return true;
             }
         }
         return false;
diff --git a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java
index 90c1ed0f69..b7716fb511 100644
--- a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java
+++ b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java
@@ -87,6 +87,11 @@ class AbyssalPersecutorCannotWinEffect extends ContinuousRuleModifiyingEffectImp
         super(effect);
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.LOSES || event.getType() == EventType.WINS ;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if ((event.getType() == EventType.LOSES && game.getOpponents(source.getControllerId()).contains(event.getPlayerId()))
diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java
index 03f7f71cbd..51e1a1ec80 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java
@@ -99,6 +99,16 @@ public class ConditionalContinuousRuleModifyingEffect extends ContinuousRuleModi
         return false;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        if (effect.checksEventType(event, game)) {
+            return true;
+        } else if (otherwiseEffect != null) {
+            return otherwiseEffect.checksEventType(event, game);
+        }
+        return false;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (!initDone) { // if simpleStaticAbility, init won't be called
diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/mage/abilities/effects/ContinuousEffects.java
index d769ef989a..220b9570a1 100644
--- a/Mage/src/mage/abilities/effects/ContinuousEffects.java
+++ b/Mage/src/mage/abilities/effects/ContinuousEffects.java
@@ -646,6 +646,9 @@ public class ContinuousEffects implements Serializable {
      */
     public boolean preventedByRuleModification(GameEvent event, Ability targetAbility, Game game, boolean checkPlayableMode) {
        for (ContinuousRuleModifiyingEffect effect: continuousRuleModifyingEffects) {
+            if (!effect.checksEventType(event, game)) {
+                continue;
+            }
             for (Ability sourceAbility : continuousRuleModifyingEffects.getAbility(effect.getId())) {
                 if (!(sourceAbility instanceof StaticAbility) || sourceAbility.isInUseableZone(game, null, false)) {
                     if (effect.getDuration() != Duration.OneUse || !effect.isUsed()) {
diff --git a/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffect.java b/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffect.java
index 60e2754368..f6bc9981b6 100644
--- a/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffect.java
+++ b/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffect.java
@@ -38,6 +38,15 @@ import mage.game.events.GameEvent;
  */
 public interface ContinuousRuleModifiyingEffect extends ContinuousEffect {
 
+    /**
+     * This check for the relevant events is called at first to prevent further actions if
+     * the current event is ignored from this effect
+     * @param event
+     * @param game
+     * @return
+     */
+    boolean checksEventType(GameEvent event, Game game);
+
     /**
      * 
      * @param event the event to check if it may happen
diff --git a/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffectImpl.java b/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffectImpl.java
index 9d4f756bab..ee3fdadb0e 100644
--- a/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffectImpl.java
+++ b/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffectImpl.java
@@ -78,6 +78,11 @@ public abstract class ContinuousRuleModifiyingEffectImpl extends ContinuousEffec
         this.messageToGameLog = effect.messageToGameLog;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return true;
+    }
+
     @Override
     public boolean apply(Game game, Ability source) {
         return true;
diff --git a/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java b/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java
index c3a3ad2041..6870b413cf 100644
--- a/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java
@@ -61,14 +61,17 @@ public class CantActivateAbilitiesAttachedEffect extends ContinuousRuleModifiyin
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.ACTIVATE_ABILITY;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.ACTIVATE_ABILITY) {
-            Permanent enchantment = game.getPermanent(source.getSourceId());
-            if (enchantment != null && enchantment.getAttachedTo() != null) {
-                if (event.getSourceId().equals(enchantment.getAttachedTo())) {
-                    return true;
-                }
+        Permanent enchantment = game.getPermanent(source.getSourceId());
+        if (enchantment != null && enchantment.getAttachedTo() != null) {
+            if (event.getSourceId().equals(enchantment.getAttachedTo())) {
+                return true;
             }
         }
         return false;
diff --git a/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java b/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java
index d44f080bc6..45a6ea29b2 100644
--- a/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java
@@ -80,19 +80,22 @@ public class CantBeCounteredControlledEffect extends ContinuousRuleModifiyingEff
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.COUNTER;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.COUNTER) {
-            Spell spell = game.getStack().getSpell(event.getTargetId());
-            if (spell != null && spell.getControllerId().equals(source.getControllerId())
-                    && filterTarget.match(spell, game)) {
-                if (filterSource == null) {
+        Spell spell = game.getStack().getSpell(event.getTargetId());
+        if (spell != null && spell.getControllerId().equals(source.getControllerId())
+                && filterTarget.match(spell, game)) {
+            if (filterSource == null) {
+                return true;
+            } else {
+                MageObject sourceObject = game.getObject(source.getSourceId());
+                if (sourceObject != null && filterSource.match(sourceObject, game)) {
                     return true;
-                } else {
-                    MageObject sourceObject = game.getObject(source.getSourceId());
-                    if (sourceObject != null && filterSource.match(sourceObject, game)) {
-                        return true;
-                    }
                 }
             }
         }
diff --git a/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java
index c74c54775e..56e13eb14a 100644
--- a/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java
@@ -74,14 +74,18 @@ public class CantBeCounteredSourceEffect extends ContinuousRuleModifiyingEffectI
         return staticText;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.COUNTER;
+    }
+
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.COUNTER) {
-            Spell spell = game.getStack().getSpell(event.getTargetId());
-            if (spell != null) {
-                if (spell.getSourceId().equals(source.getSourceId())) {
-                    return true;
-                }
+        Spell spell = game.getStack().getSpell(event.getTargetId());
+        if (spell != null) {
+            if (spell.getSourceId().equals(source.getSourceId())) {
+                return true;
             }
         }
         return false;
diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java
index d030c329dc..8c8f68724e 100644
--- a/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java
@@ -81,20 +81,23 @@ public class CantBeTargetedAllEffect extends ContinuousRuleModifiyingEffectImpl
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.TARGET;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.TARGET) {
-            Permanent permanent = game.getPermanent(event.getTargetId());
-            if (permanent != null && filterTarget.match(permanent, source.getSourceId(), source.getControllerId(), game)) {
-                if (filterSource == null) {
+        Permanent permanent = game.getPermanent(event.getTargetId());
+        if (permanent != null && filterTarget.match(permanent, source.getSourceId(), source.getControllerId(), game)) {
+            if (filterSource == null) {
+                return true;
+            }
+            else {
+                StackObject sourceObject = game.getStack().getStackObject(event.getSourceId());
+                if (sourceObject != null && filterSource.match(sourceObject, sourceObject.getSourceId(), game)) {
                     return true;
                 }
-                else {
-                    StackObject sourceObject = game.getStack().getStackObject(event.getSourceId());
-                    if (sourceObject != null && filterSource.match(sourceObject, sourceObject.getSourceId(), game)) {
-                        return true;
-                    }
-                }
             }
         }
         return false;
diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java
index 0b1e988940..5971c1ac3d 100644
--- a/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java
@@ -72,15 +72,18 @@ public class CantBeTargetedAttachedEffect extends ContinuousRuleModifiyingEffect
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.TARGET;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.TARGET) {
-            Permanent attachment = game.getPermanent(source.getSourceId());
-            if (attachment != null && event.getTargetId().equals(attachment.getAttachedTo())) {
-                StackObject sourceObject = game.getStack().getStackObject(event.getSourceId());
-                if (sourceObject != null && filterSource.match(sourceObject, source.getControllerId(), game)) {
-                    return true;
-                }
+        Permanent attachment = game.getPermanent(source.getSourceId());
+        if (attachment != null && event.getTargetId().equals(attachment.getAttachedTo())) {
+            StackObject sourceObject = game.getStack().getStackObject(event.getSourceId());
+            if (sourceObject != null && filterSource.match(sourceObject, source.getControllerId(), game)) {
+                return true;
             }
         }
         return false;
diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java
index e00e75831d..f8165a0f4b 100644
--- a/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java
@@ -66,10 +66,15 @@ public class CantBeTargetedSourceEffect extends ContinuousRuleModifiyingEffectIm
     public boolean apply(Game game, Ability source) {
         return true;
     }
+    
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.TARGET;
+    }
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.TARGET && event.getTargetId().equals(source.getSourceId())) {
+        if (event.getTargetId().equals(source.getSourceId())) {
             StackObject sourceObject = game.getStack().getStackObject(event.getSourceId());
             if (sourceObject != null && filterSource.match(sourceObject, source.getControllerId(), game)) {
                 return true;
diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java
index a8c3c1bb1d..f79af2655e 100644
--- a/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java
@@ -67,9 +67,14 @@ public class CantBeTargetedTargetEffect extends ContinuousRuleModifiyingEffectIm
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.TARGET;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.TARGET && getTargetPointer().getTargets(game, source).contains(event.getTargetId())) {
+        if (getTargetPointer().getTargets(game, source).contains(event.getTargetId())) {
             StackObject sourceObject = game.getStack().getStackObject(event.getSourceId());
             if (sourceObject != null && filterSource.match(sourceObject, source.getControllerId(), game)) {
                 return true;
diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java
index e9158b91f2..ebca00685a 100644
--- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java
@@ -42,7 +42,11 @@ public class DontUntapInControllersNextUntapStepSourceEffect extends ContinuousR
         return null;
     }
 
-    
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.UNTAP_STEP || event.getType() == GameEvent.EventType.UNTAP;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         // the check for turn number is needed if multiple effects are added to prevent untap in next untap step
@@ -55,7 +59,7 @@ public class DontUntapInControllersNextUntapStepSourceEffect extends ContinuousR
             return false;
         }
         // remember the turn of the untap step the effect has to be applied
-        if (GameEvent.EventType.UNTAP_STEP.equals(event.getType()) 
+        if (GameEvent.EventType.UNTAP_STEP.equals(event.getType())
                 && game.getActivePlayerId().equals(source.getControllerId())) {
             if (validForTurnNum == game.getTurnNum()) { // the turn has a second untap step but the effect is already related to the first untap step
                 discard();
diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java
index 1702e81da4..356838b0a5 100644
--- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java
@@ -86,6 +86,11 @@ public class DontUntapInControllersNextUntapStepTargetEffect extends ContinuousR
         }
         return null;
     }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.UNTAP_STEP || event.getType() == EventType.UNTAP;
+    }
     
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
@@ -99,7 +104,7 @@ public class DontUntapInControllersNextUntapStepTargetEffect extends ContinuousR
             return false;
         }
         // remember the turn of the untap step the effect has to be applied
-        if (GameEvent.EventType.UNTAP_STEP.equals(event.getType())) {            
+        if (GameEvent.EventType.UNTAP_STEP.equals(event.getType())) {
             UUID controllerId = null;
             for(UUID targetId : getTargetPointer().getTargets(game, source)) {
                 Permanent permanent = game.getPermanent(targetId);
@@ -109,17 +114,16 @@ public class DontUntapInControllersNextUntapStepTargetEffect extends ContinuousR
             }
             if (controllerId == null) { // no more targets on the battlefield, effect can be discarded
                 discard();
-                return false;                                
+                return false;
             }
-            
-            if (game.getActivePlayerId().equals(controllerId)) { 
+
+            if (game.getActivePlayerId().equals(controllerId)) {
                 if (validForTurnNum == game.getTurnNum()) { // the turn has a second untap step but the effect is already related to the first untap step
                     discard();
-                    return false;                                
+                    return false;
                 }
                 validForTurnNum = game.getTurnNum();
             }
-            
         }
         
         if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == EventType.UNTAP) {
diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java
index 87561e97f3..2b203c2222 100644
--- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java
+++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java
@@ -41,6 +41,7 @@ import static mage.constants.TargetController.YOU;
 import mage.filter.FilterPermanent;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
@@ -76,10 +77,15 @@ public class DontUntapInControllersUntapStepAllEffect extends ContinuousRuleModi
     public boolean apply(Game game, Ability source) {
         return false;
     }
+    
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.UNTAP;
+    }
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (GameEvent.EventType.UNTAP.equals(event.getType()) && PhaseStep.UNTAP.equals(game.getTurn().getStepType())) {
+        if (PhaseStep.UNTAP.equals(game.getTurn().getStepType())) {
             Permanent permanent = game.getPermanent(event.getTargetId());
             if (permanent != null) {
                 switch(targetController) {
diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java
index 350f260174..164ec3bced 100644
--- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java
@@ -45,10 +45,14 @@ public class DontUntapInControllersUntapStepEnchantedEffect extends ContinuousRu
         return null;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.UNTAP;
+    }
     
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (GameEvent.EventType.UNTAP.equals(event.getType()) && PhaseStep.UNTAP.equals(game.getTurn().getStepType())) {
+        if (PhaseStep.UNTAP.equals(game.getTurn().getStepType())) {
             Permanent enchantment = game.getPermanent(source.getSourceId());
             if (enchantment != null && enchantment.getAttachedTo() != null && event.getTargetId().equals(enchantment.getAttachedTo())) {
                 Permanent permanent = game.getPermanent(enchantment.getAttachedTo());
diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java
index f309574aa6..694098bf19 100644
--- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java
@@ -62,10 +62,14 @@ public class DontUntapInControllersUntapStepSourceEffect extends ContinuousRuleM
         return false;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.UNTAP;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (game.getTurn().getStepType() == PhaseStep.UNTAP
-                && event.getType() == EventType.UNTAP
                 && event.getTargetId().equals(source.getSourceId())) {
             Permanent permanent = game.getPermanent(source.getSourceId());
             if (permanent != null && permanent.getControllerId().equals(game.getActivePlayerId())) {
diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java
index 9bdcc13d54..327a85d02b 100644
--- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java
@@ -38,7 +38,6 @@ import mage.constants.Outcome;
 import mage.constants.PhaseStep;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
 
 /**
@@ -74,10 +73,15 @@ public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleM
         }
         return null;
     }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.UNTAP;
+    }
     
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (GameEvent.EventType.UNTAP.equals(event.getType()) && PhaseStep.UNTAP.equals(game.getTurn().getStepType())) {
+        if (PhaseStep.UNTAP.equals(game.getTurn().getStepType())) {
             for (UUID targetId : targetPointer.getTargets(game, source)) {
                 if (event.getTargetId().equals(targetId)) {
                     Permanent permanent = game.getPermanent(targetId);
diff --git a/Mage/src/mage/abilities/effects/common/EpicEffect.java b/Mage/src/mage/abilities/effects/common/EpicEffect.java
index a161e9cc01..325f3d3ded 100644
--- a/Mage/src/mage/abilities/effects/common/EpicEffect.java
+++ b/Mage/src/mage/abilities/effects/common/EpicEffect.java
@@ -108,11 +108,15 @@ class EpicReplacementEffect extends ContinuousRuleModifiyingEffectImpl {
         }
         return null;
     }
-    
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.CAST_SPELL
-                && source.getControllerId() == event.getPlayerId()) {
+        if (source.getControllerId() == event.getPlayerId()) {
             MageObject object = game.getObject(event.getSourceId());
             if (object != null) {
                 return true;
diff --git a/Mage/src/mage/abilities/effects/common/continious/CantCastMoreThanOneSpellEffect.java b/Mage/src/mage/abilities/effects/common/continious/CantCastMoreThanOneSpellEffect.java
index 85c37b476d..81d04070fc 100644
--- a/Mage/src/mage/abilities/effects/common/continious/CantCastMoreThanOneSpellEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/CantCastMoreThanOneSpellEffect.java
@@ -68,35 +68,38 @@ public class CantCastMoreThanOneSpellEffect extends ContinuousRuleModifiyingEffe
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.CAST_SPELL) {
-            switch (targetController) {
-                case YOU:
-                    if (!event.getPlayerId().equals(source.getControllerId())) {
-                        return false;
-                    }
-                    break;
-                case NOT_YOU:
-                    if (event.getPlayerId().equals(source.getControllerId())) {
-                        return false;
-                    }
-                    break;
-                case OPPONENT:
-                    if (!game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
-                        return false;
-                    }
-                    break;
-                case CONTROLLER_ATTACHED_TO:
-                    Permanent attachment = game.getPermanent(source.getSourceId());
-                    if (attachment == null || !attachment.getAttachedTo().equals(event.getPlayerId())) {
-                        return false;
-                    }                    
-            }
-            CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get("CastSpellLastTurnWatcher");
-            if (watcher != null && watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(event.getPlayerId())> 0) {
-                return true;
-            }
+        switch (targetController) {
+            case YOU:
+                if (!event.getPlayerId().equals(source.getControllerId())) {
+                    return false;
+                }
+                break;
+            case NOT_YOU:
+                if (event.getPlayerId().equals(source.getControllerId())) {
+                    return false;
+                }
+                break;
+            case OPPONENT:
+                if (!game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
+                    return false;
+                }
+                break;
+            case CONTROLLER_ATTACHED_TO:
+                Permanent attachment = game.getPermanent(source.getSourceId());
+                if (attachment == null || !attachment.getAttachedTo().equals(event.getPlayerId())) {
+                    return false;
+                }                    
+        }
+        CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get("CastSpellLastTurnWatcher");
+        if (watcher != null && watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(event.getPlayerId())> 0) {
+            return true;
         }
         return false;
     }
diff --git a/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java b/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java
index ba4f29177f..ce6693c4a6 100644
--- a/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java
@@ -35,6 +35,7 @@ import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
 
 /**
  *
@@ -62,13 +63,16 @@ public class CantRegenerateTargetEffect extends ContinuousRuleModifiyingEffectIm
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.REGENERATE;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (GameEvent.EventType.REGENERATE.equals(event.getType())) {
-            UUID targetId = getTargetPointer().getFirst(game, source);
-            if (targetId != null) {
-                return targetId.equals(event.getTargetId());
-            }
+        UUID targetId = getTargetPointer().getFirst(game, source);
+        if (targetId != null) {
+            return targetId.equals(event.getTargetId());
         }
         return false;
     }
diff --git a/Mage/src/mage/abilities/keyword/SplitSecondAbility.java b/Mage/src/mage/abilities/keyword/SplitSecondAbility.java
index 8e583142db..72bb0f8ac6 100644
--- a/Mage/src/mage/abilities/keyword/SplitSecondAbility.java
+++ b/Mage/src/mage/abilities/keyword/SplitSecondAbility.java
@@ -55,6 +55,11 @@ class SplitSecondEffect extends ContinuousRuleModifiyingEffectImpl {
         return "You can't cast spells or activate abilities that aren't mana abilities (Split second).";
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL || event.getType() == GameEvent.EventType.ACTIVATE_ABILITY;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (event.getType() == GameEvent.EventType.CAST_SPELL) {