diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index cbbde47a278..e537d3c6972 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -1554,7 +1554,7 @@ public class ComputerUtil {
                 Iterables.addAll(objects, ComputerUtil.predictThreatenedObjects(ai, sa, spell));
             }
             if (top) {
-                break;  // only evaluate top-stack
+                break; // only evaluate top-stack
             }
         }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
index da96861d9a5..82620607240 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
@@ -85,9 +85,6 @@ public class PumpAllAi extends PumpAiBase {
         CardCollection comp = CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), valid, source.getController(), source, sa);
         CardCollection human = CardLists.getValidCards(opp.getCardsIn(ZoneType.Battlefield), valid, source.getController(), source, sa);
 
-        if (!game.getStack().isEmpty() && !sa.isCurse()) {
-            return pumpAgainstRemoval(ai, sa, comp);
-        }
         if (sa.isCurse()) {
             if (defense < 0) { // try to destroy creatures
                 comp = CardLists.filter(comp, new Predicate<Card>() {
@@ -143,6 +140,10 @@ public class PumpAllAi extends PumpAiBase {
             return (ComputerUtilCard.evaluateCreatureList(comp) + 200) < ComputerUtilCard.evaluateCreatureList(human);
         } // end Curse
 
+        if (!game.getStack().isEmpty()) {
+            return pumpAgainstRemoval(ai, sa, comp);
+        }
+
         return !CardLists.getValidCards(getPumpCreatures(ai, sa, defense, power, keywords, false), valid, source.getController(), source, sa).isEmpty();
     } // pumpAllCanPlayAI()
 
@@ -153,6 +154,11 @@ public class PumpAllAi extends PumpAiBase {
 
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
+        // it might help so take it
+        if (!sa.usesTargeting() && !sa.isCurse() && sa.getParam("ValidCards") != null && sa.getParam("ValidCards").contains("YouCtrl")) {
+            return true;
+        }
+
         // important to call canPlay first so targets are added if needed
         return canPlayAI(ai, sa) || mandatory;
     }
diff --git a/forge-gui/res/cardsfolder/a/akoum_battlesinger.txt b/forge-gui/res/cardsfolder/a/akoum_battlesinger.txt
index 75b295ba71d..405a92bf4e4 100644
--- a/forge-gui/res/cardsfolder/a/akoum_battlesinger.txt
+++ b/forge-gui/res/cardsfolder/a/akoum_battlesinger.txt
@@ -3,8 +3,7 @@ ManaCost:1 R
 Types:Creature Human Berserker Ally
 PT:1/1
 K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control get +1/+0 until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control get +1/+0 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control get +1/+0 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.Ally+YouCtrl | NumAtt$ 1
 SVar:BuffedBy:Ally
 Oracle:Haste\nWhenever Akoum Battlesinger or another Ally enters the battlefield under your control, you may have Ally creatures you control get +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/chasm_guide.txt b/forge-gui/res/cardsfolder/c/chasm_guide.txt
index 00beb89cff0..937be81eac5 100644
--- a/forge-gui/res/cardsfolder/c/chasm_guide.txt
+++ b/forge-gui/res/cardsfolder/c/chasm_guide.txt
@@ -2,8 +2,7 @@ Name:Chasm Guide
 ManaCost:3 R
 Types:Creature Goblin Scout Ally
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain haste until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain haste until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain haste until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Haste
 SVar:PlayMain1:ALWAYS
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/f/firemantle_mage.txt b/forge-gui/res/cardsfolder/f/firemantle_mage.txt
index c6f2352410b..396405b0239 100644
--- a/forge-gui/res/cardsfolder/f/firemantle_mage.txt
+++ b/forge-gui/res/cardsfolder/f/firemantle_mage.txt
@@ -2,8 +2,7 @@ Name:Firemantle Mage
 ManaCost:2 R
 Types:Creature Human Shaman Ally
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain menace until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain menace until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain menace until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Menace
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/h/hagra_diabolist.txt b/forge-gui/res/cardsfolder/h/hagra_diabolist.txt
index c1204860f97..6decef85886 100644
--- a/forge-gui/res/cardsfolder/h/hagra_diabolist.txt
+++ b/forge-gui/res/cardsfolder/h/hagra_diabolist.txt
@@ -2,8 +2,7 @@ Name:Hagra Diabolist
 ManaCost:4 B
 Types:Creature Ogre Shaman Ally
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.
 SVar:TrigLoseLife:DB$LoseLife | ValidTgts$ Player | LifeAmount$ NumAllies | TgtPrompt$ Select a target player.
 SVar:NumAllies:Count$Valid Ally.YouCtrl
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/h/hero_of_goma_fada.txt b/forge-gui/res/cardsfolder/h/hero_of_goma_fada.txt
index c6d4bc55c21..b71cabe1f79 100644
--- a/forge-gui/res/cardsfolder/h/hero_of_goma_fada.txt
+++ b/forge-gui/res/cardsfolder/h/hero_of_goma_fada.txt
@@ -2,8 +2,7 @@ Name:Hero of Goma Fada
 ManaCost:4 W
 Types:Creature Human Knight Ally
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain indestructible until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain indestructible until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain indestructible until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Indestructible
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/h/highland_berserker.txt b/forge-gui/res/cardsfolder/h/highland_berserker.txt
index caeac485877..91e73198218 100644
--- a/forge-gui/res/cardsfolder/h/highland_berserker.txt
+++ b/forge-gui/res/cardsfolder/h/highland_berserker.txt
@@ -2,8 +2,7 @@ Name:Highland Berserker
 ManaCost:1 R
 Types:Creature Human Berserker Ally
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain first strike until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain first strike until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain first strike until end of turn.
 SVar:TrigPump:DB$ PumpAll | ValidCards$ Ally.YouCtrl | KW$ First Strike
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/k/kabira_evangel.txt b/forge-gui/res/cardsfolder/k/kabira_evangel.txt
index 629f6db4d1e..b735048624c 100644
--- a/forge-gui/res/cardsfolder/k/kabira_evangel.txt
+++ b/forge-gui/res/cardsfolder/k/kabira_evangel.txt
@@ -2,8 +2,7 @@ Name:Kabira Evangel
 ManaCost:2 W
 Types:Creature Human Cleric Ally
 PT:2/3
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigProt | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may choose a color. If you do, Allies you control gain protection from the chosen color until end of turn.
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigProt | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may choose a color. If you do, Allies you control gain protection from the chosen color until end of turn.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigProt | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may choose a color. If you do, Allies you control gain protection from the chosen color until end of turn.
 SVar:TrigProt:DB$ProtectionAll | ValidCards$ Card.Ally+YouCtrl | Gains$ Choice | Choices$ AnyColor
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kabira_evangel.jpg
 Oracle:Whenever Kabira Evangel or another Ally enters the battlefield under your control, you may choose a color. If you do, Allies you control gain protection from the chosen color until end of turn.
diff --git a/forge-gui/res/cardsfolder/k/kor_bladewhirl.txt b/forge-gui/res/cardsfolder/k/kor_bladewhirl.txt
index d71feccae8a..cb9ab24cbfb 100644
--- a/forge-gui/res/cardsfolder/k/kor_bladewhirl.txt
+++ b/forge-gui/res/cardsfolder/k/kor_bladewhirl.txt
@@ -2,8 +2,7 @@ Name:Kor Bladewhirl
 ManaCost:1 W
 Types:Creature Kor Soldier Ally
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain first strike until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain first strike until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain first strike until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/l/lantern_scout.txt b/forge-gui/res/cardsfolder/l/lantern_scout.txt
index 3f2beff5631..f8330392bcb 100644
--- a/forge-gui/res/cardsfolder/l/lantern_scout.txt
+++ b/forge-gui/res/cardsfolder/l/lantern_scout.txt
@@ -2,8 +2,7 @@ Name:Lantern Scout
 ManaCost:2 W
 Types:Creature Human Scout Ally
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain lifelink until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain lifelink until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain lifelink until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Lifelink
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/m/makindi_patrol.txt b/forge-gui/res/cardsfolder/m/makindi_patrol.txt
index 1423d141228..fb1eea567e7 100644
--- a/forge-gui/res/cardsfolder/m/makindi_patrol.txt
+++ b/forge-gui/res/cardsfolder/m/makindi_patrol.txt
@@ -2,8 +2,7 @@ Name:Makindi Patrol
 ManaCost:2 W
 Types:Creature Human Knight Ally
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain vigilance until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain vigilance until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain vigilance until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/m/murasa_pyromancer.txt b/forge-gui/res/cardsfolder/m/murasa_pyromancer.txt
index c59b4da83fb..dd6cfecfc49 100644
--- a/forge-gui/res/cardsfolder/m/murasa_pyromancer.txt
+++ b/forge-gui/res/cardsfolder/m/murasa_pyromancer.txt
@@ -2,8 +2,7 @@ Name:Murasa Pyromancer
 ManaCost:4 R R
 Types:Creature Human Shaman Ally
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature equal to the number of Allies you control.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature equal to the number of Allies you control.
 SVar:TrigDamage:DB$DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ NumAllies
 SVar:NumAllies:Count$Valid Ally.YouCtrl
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/o/ondu_champion.txt b/forge-gui/res/cardsfolder/o/ondu_champion.txt
index c003273347d..1f5b40842ae 100644
--- a/forge-gui/res/cardsfolder/o/ondu_champion.txt
+++ b/forge-gui/res/cardsfolder/o/ondu_champion.txt
@@ -2,8 +2,7 @@ Name:Ondu Champion
 ManaCost:2 R R
 Types:Creature Minotaur Warrior Ally
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain trample until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain trample until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain trample until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Trample
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/o/ondu_cleric.txt b/forge-gui/res/cardsfolder/o/ondu_cleric.txt
index 59670fe7818..d1c456a4265 100644
--- a/forge-gui/res/cardsfolder/o/ondu_cleric.txt
+++ b/forge-gui/res/cardsfolder/o/ondu_cleric.txt
@@ -2,8 +2,7 @@ Name:Ondu Cleric
 ManaCost:1 W
 Types:Creature Kor Cleric Ally
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self| OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may gain life equal to the number of Allies you control.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may gain life equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may gain life equal to the number of Allies you control.
 SVar:TrigGainLife:DB$GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Count$Valid Ally.YouCtrl
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/r/resolute_blademaster.txt b/forge-gui/res/cardsfolder/r/resolute_blademaster.txt
index 7798c263209..39dcefdb594 100644
--- a/forge-gui/res/cardsfolder/r/resolute_blademaster.txt
+++ b/forge-gui/res/cardsfolder/r/resolute_blademaster.txt
@@ -2,8 +2,7 @@ Name:Resolute Blademaster
 ManaCost:3 R W
 Types:Creature Human Soldier Ally
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain double strike until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain double strike until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control gain double strike until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Double Strike
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/s/seascape_aerialist.txt b/forge-gui/res/cardsfolder/s/seascape_aerialist.txt
index 53e8e68e210..202d703712d 100644
--- a/forge-gui/res/cardsfolder/s/seascape_aerialist.txt
+++ b/forge-gui/res/cardsfolder/s/seascape_aerialist.txt
@@ -2,8 +2,7 @@ Name:Seascape Aerialist
 ManaCost:4 U
 Types:Creature Merfolk Wizard Ally
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
 SVar:TrigPump:DB$ PumpAll | ValidCards$ Ally.YouCtrl | KW$ Flying
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/t/tajuru_archer.txt b/forge-gui/res/cardsfolder/t/tajuru_archer.txt
index e40f0f756ef..271f18b6082 100644
--- a/forge-gui/res/cardsfolder/t/tajuru_archer.txt
+++ b/forge-gui/res/cardsfolder/t/tajuru_archer.txt
@@ -2,8 +2,7 @@ Name:Tajuru Archer
 ManaCost:2 G
 Types:Creature Elf Archer Ally
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self| OptionalDecider$ You | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature with flying equal to the number of Allies you control.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature with flying equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature with flying equal to the number of Allies you control.
 SVar:TrigDamage:DB$DealDamage | ValidTgts$ Creature.withFlying | NumDmg$ NumAllies | TgtPrompt$ Select a target creature with flying.
 SVar:NumAllies:Count$Valid Ally.YouCtrl
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/t/tajuru_beastmaster.txt b/forge-gui/res/cardsfolder/t/tajuru_beastmaster.txt
index 3609516ddaf..13a5c826f92 100644
--- a/forge-gui/res/cardsfolder/t/tajuru_beastmaster.txt
+++ b/forge-gui/res/cardsfolder/t/tajuru_beastmaster.txt
@@ -2,8 +2,7 @@ Name:Tajuru Beastmaster
 ManaCost:5 G
 Types:Creature Elf Warrior Ally
 PT:5/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control get +1/+1 until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control get +1/+1 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control get +1/+1 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/t/tajuru_warcaller.txt b/forge-gui/res/cardsfolder/t/tajuru_warcaller.txt
index 88641024c51..8aee5fa8517 100644
--- a/forge-gui/res/cardsfolder/t/tajuru_warcaller.txt
+++ b/forge-gui/res/cardsfolder/t/tajuru_warcaller.txt
@@ -2,8 +2,7 @@ Name:Tajuru Warcaller
 ManaCost:3 G G
 Types:Creature Elf Warrior Ally
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control get +2/+2 until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control get +2/+2 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, creatures you control get +2/+2 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +2
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/forge-gui/res/cardsfolder/t/talus_paladin.txt b/forge-gui/res/cardsfolder/t/talus_paladin.txt
index 0cf75592d69..db41c73255e 100644
--- a/forge-gui/res/cardsfolder/t/talus_paladin.txt
+++ b/forge-gui/res/cardsfolder/t/talus_paladin.txt
@@ -2,8 +2,7 @@ Name:Talus Paladin
 ManaCost:3 W
 Types:Creature Human Knight Ally
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on CARDNAME.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Ally.YouCtrl | KW$ Lifelink | SubAbility$ DBCounter
 SVar:DBCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | OptionalDecider$ You
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/t/tuktuk_grunts.txt b/forge-gui/res/cardsfolder/t/tuktuk_grunts.txt
index 383dd857edc..23a8c8f9f1c 100644
--- a/forge-gui/res/cardsfolder/t/tuktuk_grunts.txt
+++ b/forge-gui/res/cardsfolder/t/tuktuk_grunts.txt
@@ -3,8 +3,7 @@ ManaCost:4 R
 Types:Creature Goblin Warrior Ally
 PT:2/2
 K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Ally
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tuktuk_grunts.jpg
diff --git a/forge-gui/res/cardsfolder/t/tuktuk_scrapper.txt b/forge-gui/res/cardsfolder/t/tuktuk_scrapper.txt
index 288621d08da..2377f4025a7 100644
--- a/forge-gui/res/cardsfolder/t/tuktuk_scrapper.txt
+++ b/forge-gui/res/cardsfolder/t/tuktuk_scrapper.txt
@@ -2,8 +2,7 @@ Name:Tuktuk Scrapper
 ManaCost:3 R
 Types:Creature Goblin Artificer Ally
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TuktukDestroy | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may destroy target artifact. If that artifact is put into a graveyard this way, Tuktuk Scrapper deals damage to that artifact's controller equal to the number of Allies you control.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TuktukDestroy | Secondary$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may destroy target artifact. If that artifact is put into a graveyard this way, Tuktuk Scrapper deals damage to that artifact's controller equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TuktukDestroy | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may destroy target artifact. If that artifact is put into a graveyard this way, Tuktuk Scrapper deals damage to that artifact's controller equal to the number of Allies you control.
 SVar:TuktukDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | RememberDestroyed$ True | SubAbility$ TuktukDamage | SpellDescription$ If that artifact is put into a graveyard this way,
 SVar:TuktukDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True