diff --git a/Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java b/Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java
index b4f34c66ba..1b00a116e0 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java
@@ -41,7 +41,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.MulticoloredPredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 
@@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class BantSureblade extends CardImpl<BantSureblade> {
     
-    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent");
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
     
     static {
         filter.add(new MulticoloredPredicate());
@@ -75,12 +75,11 @@ public class BantSureblade extends CardImpl<BantSureblade> {
                 new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
                 new ControlsPermanentCondition(filter),
                 "As long as you control another multicolored permanent, {this} gets +1/+1"));
-        Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+        ability.addEffect(new ConditionalContinousEffect(
                 new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()),
                 new ControlsPermanentCondition(filter),
-                "As long as you control another multicolored permanent, {this} has first strike"));
+                "and has first strike"));
         this.addAbility(ability);
-        this.addAbility(ability2);
     }
 
     public BantSureblade(final BantSureblade card) {
diff --git a/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java b/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java
index 8ae4866991..88c17f611d 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java
@@ -41,7 +41,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.MulticoloredPredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 
@@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class EsperStormblade extends CardImpl<EsperStormblade> {
     
-    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent");
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
     
     static {
         filter.add(new MulticoloredPredicate());
@@ -75,12 +75,11 @@ public class EsperStormblade extends CardImpl<EsperStormblade> {
                 new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
                 new ControlsPermanentCondition(filter),
                 "As long as you control another multicolored permanent, {this} gets +1/+1"));
-        Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+        ability.addEffect(new ConditionalContinousEffect(
                 new GainAbilitySourceEffect(FlyingAbility.getInstance()),
                 new ControlsPermanentCondition(filter),
-                "As long as you control another multicolored permanent, {this} has flying"));
+                "and has flying"));
         this.addAbility(ability);
-        this.addAbility(ability2);
     }
 
     public EsperStormblade(final EsperStormblade card) {
diff --git a/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java b/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java
index 5ea11775f8..ce0e28a43d 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java
@@ -75,12 +75,11 @@ public class GrixisGrimblade extends CardImpl<GrixisGrimblade> {
                 new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
                 new ControlsPermanentCondition(filter),
                 "As long as you control another multicolored permanent, {this} gets +1/+1"));
-        Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+        ability.addEffect(new ConditionalContinousEffect(
                 new GainAbilitySourceEffect(DeathtouchAbility.getInstance()),
                 new ControlsPermanentCondition(filter),
-                "As long as you control another multicolored permanent, {this} has deathtouch"));
+                "and has deathtouch"));
         this.addAbility(ability);
-        this.addAbility(ability2);
         
     }
 
diff --git a/Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java b/Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java
index 4770275636..ecc06615bf 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java
@@ -41,7 +41,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.MulticoloredPredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 
@@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class JundHackblade extends CardImpl<JundHackblade> {
     
-     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent");
+     private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
     
     static {
         filter.add(new MulticoloredPredicate());
@@ -75,12 +75,11 @@ public class JundHackblade extends CardImpl<JundHackblade> {
                 new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
                 new ControlsPermanentCondition(filter),
                 "As long as you control another multicolored permanent, {this} gets +1/+1"));
-        Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+        ability.addEffect(new ConditionalContinousEffect(
                 new GainAbilitySourceEffect(HasteAbility.getInstance()),
                 new ControlsPermanentCondition(filter),
-                "As long as you control another multicolored permanent, {this} has haste"));
+                "and has haste"));
         this.addAbility(ability);
-        this.addAbility(ability2);
     }
 
     public JundHackblade(final JundHackblade card) {
diff --git a/Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java b/Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java
index 60bc0772b3..9d0b0b40a7 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java
@@ -41,7 +41,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.MulticoloredPredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 
@@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class NayaHushblade extends CardImpl<NayaHushblade> {
     
-    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent");
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
     
     static {
         filter.add(new MulticoloredPredicate());
@@ -74,13 +74,12 @@ public class NayaHushblade extends CardImpl<NayaHushblade> {
         Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
                 new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
                 new ControlsPermanentCondition(filter),
-                "As long as you control another multicolored permanent, Naya Hushblade gets +1/+1 and has shroud"));
-        Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+                "As long as you control another multicolored permanent, Naya Hushblade gets +1/+1"));
+        ability.addEffect(new ConditionalContinousEffect(
                 new GainAbilitySourceEffect(ShroudAbility.getInstance()),
                 new ControlsPermanentCondition(filter),
-                null));
+                " and has shroud"));
         this.addAbility(ability);
-        this.addAbility(ability2);
     }
 
     public NayaHushblade(final NayaHushblade card) {