diff --git a/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java b/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java
index d6fd2a6c25..09c803e225 100644
--- a/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java
+++ b/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java
@@ -31,20 +31,20 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.MageObject;
 import mage.abilities.Ability;
+import mage.abilities.Mode;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.SourceOnBattlefieldCondition;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.Cost;
+import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.decorator.ConditionalContinuousEffect;
-import mage.abilities.effects.common.continuous.GainControlTargetEffect;
 import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.Effects;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.GainControlTargetEffect;
 import mage.abilities.keyword.ForestwalkAbility;
-import mage.abilities.Mode;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -53,7 +53,6 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetArtifactPermanent;
 import mage.util.CardUtil;
@@ -65,7 +64,7 @@ import mage.util.CardUtil;
 public class ScarwoodBandits extends CardImpl {
 
     public ScarwoodBandits(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.ROGUE);
         this.power = new MageInt(2);
@@ -73,16 +72,16 @@ public class ScarwoodBandits extends CardImpl {
 
         // Forestwalk
         this.addAbility(new ForestwalkAbility());
-        
+
         // {2}{G}, {tap}: Unless an opponent pays {2}, gain control of target artifact for as long as Scarwood Bandits remains on the battlefield.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, 
-            new DoUnlessAnyOpponentPaysEffect(
-                new ConditionalContinuousEffect(
-                    new GainControlTargetEffect(Duration.Custom, true),
-                    new SourceOnBattlefieldCondition(),
-                    "gain control of target artifact for as long as {this} remains on the battlefield"),
-                new GenericManaCost(2)),
-            new ManaCostsImpl("{2}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
+                new DoUnlessAnyOpponentPaysEffect(
+                        new ConditionalContinuousEffect(
+                                new GainControlTargetEffect(Duration.Custom, true),
+                                SourceOnBattlefieldCondition.instance,
+                                "gain control of target artifact for as long as {this} remains on the battlefield"),
+                        new GenericManaCost(2)),
+                new ManaCostsImpl("{2}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetArtifactPermanent());
         this.addAbility(ability);
diff --git a/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java
index a10d4b7b73..34e81d3e43 100644
--- a/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java
+++ b/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java
@@ -1,16 +1,16 @@
 /*
  *  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
@@ -20,7 +20,7 @@
  *  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.
@@ -29,17 +29,14 @@ package mage.filter.common;
 
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.constants.TargetController;
-import mage.filter.FilterPermanent;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.filter.predicate.permanent.ControllerPredicate;
 
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterControlledCreaturePermanent extends FilterPermanent {
+public class FilterControlledCreaturePermanent extends FilterControlledPermanent {
 
     public FilterControlledCreaturePermanent() {
         this("creature you control");
@@ -48,7 +45,7 @@ public class FilterControlledCreaturePermanent extends FilterPermanent {
     public FilterControlledCreaturePermanent(String name) {
         super(name);
         this.add(new CardTypePredicate(CardType.CREATURE));
-        this.add(new ControllerPredicate(TargetController.YOU));
+        // this.add(new ControllerPredicate(TargetController.YOU));
     }
 
     public FilterControlledCreaturePermanent(SubType subtype, String name) {