diff --git a/Mage.Sets/src/mage/cards/a/ArcoFlagellant.java b/Mage.Sets/src/mage/cards/a/ArcoFlagellant.java
index 895477fbe2a..924f286b761 100644
--- a/Mage.Sets/src/mage/cards/a/ArcoFlagellant.java
+++ b/Mage.Sets/src/mage/cards/a/ArcoFlagellant.java
@@ -4,6 +4,7 @@ import mage.MageInt;
 import mage.abilities.common.CantBlockAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.PayLifeCost;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
 import mage.abilities.keyword.IndestructibleAbility;
 import mage.abilities.keyword.SquadAbility;
@@ -28,7 +29,7 @@ public final class ArcoFlagellant extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Squad {2}
-        this.addAbility(new SquadAbility());
+        this.addAbility(new SquadAbility(new GenericManaCost(2)));
 
         // Arco-Flagellant can't block.
         this.addAbility(new CantBlockAbility());
diff --git a/Mage.Sets/src/mage/cards/g/GaryClone.java b/Mage.Sets/src/mage/cards/g/GaryClone.java
index a9db219d974..f7045456015 100644
--- a/Mage.Sets/src/mage/cards/g/GaryClone.java
+++ b/Mage.Sets/src/mage/cards/g/GaryClone.java
@@ -2,6 +2,7 @@ package mage.cards.g;
 
 import mage.MageInt;
 import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.continuous.BoostAllEffect;
 import mage.abilities.keyword.SquadAbility;
 import mage.cards.CardImpl;
@@ -37,7 +38,7 @@ public final class GaryClone extends CardImpl {
         this.toughness = new MageInt(3);
 
         // Squad {2}
-        this.addAbility(new SquadAbility());
+        this.addAbility(new SquadAbility(new GenericManaCost(2)));
 
         // Whenever Gary Clone attacks, each creature you control named Gary Clone gets +1/+0 until end of turn.
         this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(
diff --git a/Mage.Sets/src/mage/cards/p/PowderGanger.java b/Mage.Sets/src/mage/cards/p/PowderGanger.java
index a22a0e82ea7..5d52cd882b6 100644
--- a/Mage.Sets/src/mage/cards/p/PowderGanger.java
+++ b/Mage.Sets/src/mage/cards/p/PowderGanger.java
@@ -3,6 +3,7 @@ package mage.cards.p;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.keyword.SquadAbility;
 import mage.cards.CardImpl;
@@ -27,7 +28,7 @@ public final class PowderGanger extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Squad {2}
-        this.addAbility(new SquadAbility());
+        this.addAbility(new SquadAbility(new GenericManaCost(2)));
 
         // When Powder Ganger enters the battlefield, destroy up to one target artifact.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/cards/s/SicarianInfiltrator.java b/Mage.Sets/src/mage/cards/s/SicarianInfiltrator.java
index cad6ed5c26f..ed13f926485 100644
--- a/Mage.Sets/src/mage/cards/s/SicarianInfiltrator.java
+++ b/Mage.Sets/src/mage/cards/s/SicarianInfiltrator.java
@@ -2,6 +2,7 @@ package mage.cards.s;
 
 import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.keyword.FlashAbility;
 import mage.abilities.keyword.SquadAbility;
@@ -29,7 +30,7 @@ public final class SicarianInfiltrator extends CardImpl {
         this.addAbility(FlashAbility.getInstance());
 
         // Squad {2}
-        this.addAbility(new SquadAbility());
+        this.addAbility(new SquadAbility(new GenericManaCost(2)));
 
         // Benediction of Omnissiah -- When Sicarian Infiltrator enters the battlefield, draw a card.
         this.addAbility(new EntersBattlefieldTriggeredAbility(
diff --git a/Mage.Sets/src/mage/cards/s/SpaceMarineDevastator.java b/Mage.Sets/src/mage/cards/s/SpaceMarineDevastator.java
index a405d023e9d..b47e4084ef2 100644
--- a/Mage.Sets/src/mage/cards/s/SpaceMarineDevastator.java
+++ b/Mage.Sets/src/mage/cards/s/SpaceMarineDevastator.java
@@ -3,6 +3,7 @@ package mage.cards.s;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.keyword.SquadAbility;
 import mage.cards.CardImpl;
@@ -28,7 +29,7 @@ public final class SpaceMarineDevastator extends CardImpl {
         this.toughness = new MageInt(3);
 
         // Squad {2}
-        this.addAbility(new SquadAbility());
+        this.addAbility(new SquadAbility(new GenericManaCost(2)));
 
         // Grav-cannon -- When Space Marine Devastator enters the battlefield, destroy up to one target artifact or enchantment.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/cards/u/UltramarinesHonourGuard.java b/Mage.Sets/src/mage/cards/u/UltramarinesHonourGuard.java
index c701803fa12..438252d594e 100644
--- a/Mage.Sets/src/mage/cards/u/UltramarinesHonourGuard.java
+++ b/Mage.Sets/src/mage/cards/u/UltramarinesHonourGuard.java
@@ -2,6 +2,7 @@ package mage.cards.u;
 
 import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.continuous.BoostControlledEffect;
 import mage.abilities.keyword.SquadAbility;
 import mage.cards.CardImpl;
@@ -26,7 +27,7 @@ public final class UltramarinesHonourGuard extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Squad {2}
-        this.addAbility(new SquadAbility());
+        this.addAbility(new SquadAbility(new GenericManaCost(2)));
 
         // Other creatures you control get +1/+1.
         this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(
diff --git a/Mage.Sets/src/mage/cards/v/VanguardSuppressor.java b/Mage.Sets/src/mage/cards/v/VanguardSuppressor.java
index 841e59e6542..68ad2d36e88 100644
--- a/Mage.Sets/src/mage/cards/v/VanguardSuppressor.java
+++ b/Mage.Sets/src/mage/cards/v/VanguardSuppressor.java
@@ -2,6 +2,7 @@ package mage.cards.v;
 
 import mage.MageInt;
 import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.SquadAbility;
@@ -26,7 +27,7 @@ public final class VanguardSuppressor extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Squad {2}
-        this.addAbility(new SquadAbility());
+        this.addAbility(new SquadAbility(new GenericManaCost(2)));
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
diff --git a/Mage.Sets/src/mage/cards/z/Zephyrim.java b/Mage.Sets/src/mage/cards/z/Zephyrim.java
index 6977c85f8d9..2d374ed7ee8 100644
--- a/Mage.Sets/src/mage/cards/z/Zephyrim.java
+++ b/Mage.Sets/src/mage/cards/z/Zephyrim.java
@@ -1,6 +1,7 @@
 package mage.cards.z;
 
 import mage.MageInt;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.MiracleAbility;
 import mage.abilities.keyword.SquadAbility;
@@ -26,7 +27,7 @@ public final class Zephyrim extends CardImpl {
         this.toughness = new MageInt(3);
 
         // Squad {2}
-        this.addAbility(new SquadAbility());
+        this.addAbility(new SquadAbility(new GenericManaCost(2)));
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
diff --git a/Mage/src/main/java/mage/abilities/keyword/SquadAbility.java b/Mage/src/main/java/mage/abilities/keyword/SquadAbility.java
index ca7710171b6..8c0a232a9e6 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SquadAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SquadAbility.java
@@ -5,7 +5,6 @@ import mage.abilities.SpellAbility;
 import mage.abilities.StaticAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.costs.*;
-import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.CreateTokenCopySourceEffect;
 import mage.abilities.effects.OneShotEffect;
@@ -25,9 +24,6 @@ public class SquadAbility extends StaticAbility implements OptionalAdditionalSou
     protected static final String SQUAD_ACTIVATION_VALUE_KEY = "squadActivationCount";
     protected static final String SQUAD_REMINDER = "You may pay an additional "
             + "{cost} any number of times as you cast this spell.";
-    public SquadAbility() {
-        this(new GenericManaCost(2));
-    }
 
     public SquadAbility(Cost cost) {
         super(Zone.STACK, null);
diff --git a/Utils/keywords.txt b/Utils/keywords.txt
index ea8d86bbc49..ee44b28dc67 100644
--- a/Utils/keywords.txt
+++ b/Utils/keywords.txt
@@ -116,7 +116,7 @@ Soulshift|number|
 Skulk|new|
 Spectacle|card, cost|
 Spree|card|
-Squad|new|
+Squad|cost|
 Storm|new|
 Sunburst|new|
 Suspend|number, cost, card|