diff --git a/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java b/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java
index 5490cd0893..81d8be6946 100644
--- a/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java
+++ b/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java
@@ -46,6 +46,7 @@ import mage.constants.Zone;
 import mage.filter.common.FilterPermanentCard;
 import mage.game.Game;
 import mage.players.Player;
+import mage.watchers.common.RevoltWatcher;
 
 /**
  *
@@ -53,17 +54,16 @@ import mage.players.Player;
  */
 public class AidFromTheCowl extends CardImpl {
 
-    private static final String ruleText = "<i>Revolt</i> &mdash; At the beginning of your end step, if a permanent you controlled left the battlefield this turn, " +
-        "you may reveal the top card of your library. If it's a permanent card, you may put it onto the battlefield. Otherwise, put it on the bottom of your library.";
+    private static final String ruleText = "<i>Revolt</i> &mdash; At the beginning of your end step, if a permanent you controlled left the battlefield this turn, "
+            + "you may reveal the top card of your library. If it's a permanent card, you may put it onto the battlefield. Otherwise, put it on the bottom of your library.";
 
     public AidFromTheCowl(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}");
 
-
         // <i>Revolt</i> &mdash; At the beginning of your end step, if a permanent you controlled left the battlefield this turn,
         // reveal the top card of your library. If it is a permanent card, you may put it onto the battlefield. Otherwise, put it on the bottom of your library.
         TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new AidFromTheCowlEffect(), false);
-        this.addAbility(new ConditionalTriggeredAbility(ability, new RevoltCondition(), ruleText));
+        this.addAbility(new ConditionalTriggeredAbility(ability, RevoltCondition.getInstance(), ruleText), new RevoltWatcher());
     }
 
     public AidFromTheCowl(final AidFromTheCowl card) {
diff --git a/Mage.Sets/src/mage/cards/c/CallForUnity.java b/Mage.Sets/src/mage/cards/c/CallForUnity.java
index e9db569b7c..cb45b1a0eb 100644
--- a/Mage.Sets/src/mage/cards/c/CallForUnity.java
+++ b/Mage.Sets/src/mage/cards/c/CallForUnity.java
@@ -43,6 +43,7 @@ import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.common.FilterCreaturePermanent;
+import mage.watchers.common.RevoltWatcher;
 
 /**
  *
@@ -58,7 +59,7 @@ public class CallForUnity extends CardImpl {
 
         // <i>Revolt</i> &mdash; At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a unity counter on Call for Unity.
         TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.UNITY.createInstance(), true), false);
-        this.addAbility(new ConditionalTriggeredAbility(ability, new RevoltCondition(), ruleText));
+        this.addAbility(new ConditionalTriggeredAbility(ability, RevoltCondition.getInstance(), ruleText), new RevoltWatcher());
 
         // Creatures you control get +1/+1 for each unity counter on Call for Unity.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
diff --git a/Mage.Sets/src/mage/cards/s/SolemnRecruit.java b/Mage.Sets/src/mage/cards/s/SolemnRecruit.java
index 698b3a2f1d..f386813c24 100644
--- a/Mage.Sets/src/mage/cards/s/SolemnRecruit.java
+++ b/Mage.Sets/src/mage/cards/s/SolemnRecruit.java
@@ -39,6 +39,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.counters.CounterType;
+import mage.watchers.common.RevoltWatcher;
 
 /**
  *
@@ -46,8 +47,8 @@ import mage.counters.CounterType;
  */
 public class SolemnRecruit extends CardImpl {
 
-    private static final String ruleText = "<i>Revolt</i> &mdash; At the beginning of your end step, if a permanent you controlled left the battlefield this turn, " +
-        "put a +1/+1 counter on {this}.";
+    private static final String ruleText = "<i>Revolt</i> &mdash; At the beginning of your end step, if a permanent you controlled left the battlefield this turn, "
+            + "put a +1/+1 counter on {this}.";
 
     public SolemnRecruit(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}");
@@ -62,7 +63,7 @@ public class SolemnRecruit extends CardImpl {
 
         // <i>Revolt</i> &mdash; At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a +1/+1 counter on Solemn Recruit.
         TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false);
-        this.addAbility(new ConditionalTriggeredAbility(ability, new RevoltCondition(), ruleText));
+        this.addAbility(new ConditionalTriggeredAbility(ability, RevoltCondition.getInstance(), ruleText), new RevoltWatcher());
     }
 
     public SolemnRecruit(final SolemnRecruit card) {
diff --git a/Mage.Sets/src/mage/cards/v/VengefulRebel.java b/Mage.Sets/src/mage/cards/v/VengefulRebel.java
index 937e338c0f..81f292df2f 100644
--- a/Mage.Sets/src/mage/cards/v/VengefulRebel.java
+++ b/Mage.Sets/src/mage/cards/v/VengefulRebel.java
@@ -43,6 +43,7 @@ import mage.constants.TargetController;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.target.common.TargetCreaturePermanent;
+import mage.watchers.common.RevoltWatcher;
 
 /**
  *
@@ -68,12 +69,12 @@ public class VengefulRebel extends CardImpl {
         // target creature an opponent controls gets -3/-3 until end of turn.
         Ability ability = new ConditionalTriggeredAbility(
                 new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-3, -3, Duration.EndOfTurn), false),
-                new RevoltCondition(),
+                RevoltCondition.getInstance(),
                 "When {this} enters the battlefield, if a permanent you controlled left the battlefield this turn, "
                 + "target creature an opponent controls gets -3/-3 until end of turn");
         ability.addTarget(new TargetCreaturePermanent(filter));
         ability.setAbilityWord(AbilityWord.REVOLT);
-        this.addAbility(ability);
+        this.addAbility(ability, new RevoltWatcher());
     }
 
     public VengefulRebel(final VengefulRebel card) {
diff --git a/Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java b/Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java
index 5b0f0aa4b9..5045c9c2c0 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java
@@ -1,56 +1,56 @@
-/*
- *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without modification, are
- *  permitted provided that the following conditions are met:
- *
- *     1. Redistributions of source code must retain the above copyright notice, this list of
- *        conditions and the following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the above copyright notice, this list
- *        of conditions and the following disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  The views and conclusions contained in the software and documentation are those of the
- *  authors and should not be interpreted as representing official policies, either expressed
- *  or implied, of BetaSteward_at_googlemail.com.
- */
-package mage.abilities.condition.common;
-
-import mage.abilities.Ability;
-import mage.abilities.condition.Condition;
-import mage.game.Game;
-import mage.watchers.common.RevoltWatcher;
-
-/**
- * @author emerald000
- */
-public class RevoltCondition implements Condition {
-
-    private static final RevoltCondition fInstance = new RevoltCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        RevoltWatcher watcher = (RevoltWatcher) game.getState().getWatchers().get("Revolt");
-        return watcher.revoltActive(source.getControllerId());
-    }
-
-    @Override
-    public String toString() {
-        return "if a permanent you control left the battlefield this turn";
-    }
-}
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.abilities.condition.common;
+
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.game.Game;
+import mage.watchers.common.RevoltWatcher;
+
+/**
+ * @author emerald000
+ */
+public class RevoltCondition implements Condition {
+
+    private static final RevoltCondition fInstance = new RevoltCondition();
+
+    public static Condition getInstance() {
+        return fInstance;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        RevoltWatcher watcher = (RevoltWatcher) game.getState().getWatchers().get("Revolt");
+        return watcher != null && watcher.revoltActive(source.getControllerId());
+    }
+
+    @Override
+    public String toString() {
+        return "if a permanent you control left the battlefield this turn";
+    }
+}