diff --git a/.gitattributes b/.gitattributes
index 686bbb5b887..ee187341201 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1233,7 +1233,7 @@ res/cardsfolder/chandler.txt -text svneol=native#text/plain
 res/cardsfolder/chandra_nalaar.txt -text svneol=native#text/plain
 res/cardsfolder/chandras_outrage.txt -text svneol=native#text/plain
 res/cardsfolder/chandras_spitfire.txt -text svneol=native#text/plain
-res/cardsfolder/change_of_heart.txt svneol=native#text/plain
+res/cardsfolder/change_of_heart.txt -text svneol=native#text/plain
 res/cardsfolder/changeling_berserker.txt -text svneol=native#text/plain
 res/cardsfolder/changeling_hero.txt -text svneol=native#text/plain
 res/cardsfolder/changeling_sentinel.txt -text svneol=native#text/plain
@@ -1581,7 +1581,7 @@ res/cardsfolder/culling_the_weak.txt -text svneol=native#text/plain
 res/cardsfolder/cultbrand_cinder.txt -text svneol=native#text/plain
 res/cardsfolder/cultivate.txt -text svneol=native#text/plain
 res/cardsfolder/cumber_stone.txt -text svneol=native#text/plain
-res/cardsfolder/cunning.txt svneol=native#text/plain
+res/cardsfolder/cunning.txt -text svneol=native#text/plain
 res/cardsfolder/cunning_advisor.txt -text svneol=native#text/plain
 res/cardsfolder/cunning_lethemancer.txt -text svneol=native#text/plain
 res/cardsfolder/cunning_sparkmage.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/act_of_treason.txt b/res/cardsfolder/act_of_treason.txt
index e342f6726ae..7cddf85023f 100644
--- a/res/cardsfolder/act_of_treason.txt
+++ b/res/cardsfolder/act_of_treason.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Sorcery
 Text:no text
 A:SP$ GainControl | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
-SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_treason.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/121.jpg
diff --git a/res/cardsfolder/allay.txt b/res/cardsfolder/allay.txt
index 680dc011f6a..6adae3379bd 100644
--- a/res/cardsfolder/allay.txt
+++ b/res/cardsfolder/allay.txt
@@ -4,8 +4,7 @@ Types:Instant
 Text:no text
 A:SP$ Destroy | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
 SVar:Buyback:3
-SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/allay.jpg
 SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/1.jpg
-End
+End
diff --git a/res/cardsfolder/battlegrowth.txt b/res/cardsfolder/battlegrowth.txt
index af43fb4f8db..d5864fc6a0a 100644
--- a/res/cardsfolder/battlegrowth.txt
+++ b/res/cardsfolder/battlegrowth.txt
@@ -3,7 +3,6 @@ ManaCost:G
 Types:Instant
 Text:no text
 A:SP$ PutCounter | Cost$ G | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
-SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/battlegrowth.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/113.jpg
diff --git a/res/cardsfolder/blatant_thievery.txt b/res/cardsfolder/blatant_thievery.txt
index e5d7335dc3e..6ca8e4ad4ff 100644
--- a/res/cardsfolder/blatant_thievery.txt
+++ b/res/cardsfolder/blatant_thievery.txt
@@ -3,7 +3,6 @@ ManaCost:4 U U U
 Types:Sorcery
 Text:no text
 A:SP$ GainControl | Cost$ 4 U U U | ValidTgts$ Permanent.YouDontCtrl | TgtPrompt$ Select target permanent opponent controls. | SpellDescription$ For each opponent, gain control of target permanent that player controls. (This effect lasts indefinitely.)
-SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blatant_thievery.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/71.jpg
diff --git a/res/cardsfolder/blind_with_anger.txt b/res/cardsfolder/blind_with_anger.txt
index 3e31c754299..0b30df92ae5 100644
--- a/res/cardsfolder/blind_with_anger.txt
+++ b/res/cardsfolder/blind_with_anger.txt
@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Instant Arcane
 Text:no text
 A:SP$ GainControl | Cost$ 3 R | ValidTgts$ Creature.nonLegendary | TgtPrompt$ Select target nonlegendary creature. | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Untap target nonlegendary creature and gain control of it until end of turn. That creature gains haste until end of turn.
-SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blind_with_anger.jpg
 SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/158.jpg
diff --git a/res/cardsfolder/call_to_glory.txt b/res/cardsfolder/call_to_glory.txt
index 320e8c668f7..efa7c3190d0 100644
--- a/res/cardsfolder/call_to_glory.txt
+++ b/res/cardsfolder/call_to_glory.txt
@@ -2,9 +2,9 @@ Name:Call to Glory
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$ UntapAll | Cost$ 1 W | ValidCards$ Creature.YouCtrl | SpellDescription$ Untap all creatures you control. Samurai creatures you control get +1/+1 until end of turn. | SubAbility$ SVar=DBPumpYourSamurai
+A:SP$ UntapAll | Cost$ 1 W | ValidCards$ Creature.YouCtrl | SpellDescription$ Untap all creatures you control. Samurai creatures you control get +1/+1 until end of turn. | SubAbility$ SVar=DBPumpYourSamurai
 SVar:DBPumpYourSamurai:DB$ PumpAll | ValidCards$ Creature.Samurai+YouCtrl | NumAtt$+1 | NumDef$ +1
-SVar:PlayMain1:TRUE
+SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/call_to_glory.jpg
 SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/4.jpg
diff --git a/res/cardsfolder/capsize.txt b/res/cardsfolder/capsize.txt
index dd500dffbf5..cac5c69731a 100644
--- a/res/cardsfolder/capsize.txt
+++ b/res/cardsfolder/capsize.txt
@@ -4,8 +4,6 @@ Types:Instant
 Text:no text
 A:SP$ ChangeZone | Cost$ 1 U U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Buyback:3
-SVar:RemAIDeck:True
-SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/capsize.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/55.jpg
diff --git a/res/cardsfolder/chalice_of_the_void.txt b/res/cardsfolder/chalice_of_the_void.txt
index ba40e6ac305..8ad615d6e10 100644
--- a/res/cardsfolder/chalice_of_the_void.txt
+++ b/res/cardsfolder/chalice_of_the_void.txt
@@ -1,7 +1,12 @@
 Name:Chalice of the Void
-ManaCost:X X 0
+ManaCost:X X
 Types:Artifact
-Text:Chalice of the Void enters the battlefield with X charge counters on it.\r\nWhenever a player casts a spell with converted mana cost equal to the number of charge counters on Chalice of the Void, counter that spell.
+Text:no text
+K:etbCounter:CHARGE:X
+T:Mode$ SpellCast | ValidCard$ Card.cmcEQY | ValidActivatingPlayer$ Each | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever a player casts a spell with converted mana cost equal to the number of charge counters on CARDNAME, counter that spell.
+SVar:TrigCounter:AB$Counter | Cost$ 0 | Defined$ TriggeredSpellAbility
+SVar:X:Count$xPaid
+SVar:Y:Count$CardCounters.CHARGE
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chalice_of_the_void.jpg
diff --git a/res/cardsfolder/change_of_heart.txt b/res/cardsfolder/change_of_heart.txt
index 91cc976e73f..8942ec3fbf7 100644
--- a/res/cardsfolder/change_of_heart.txt
+++ b/res/cardsfolder/change_of_heart.txt
@@ -1,11 +1,11 @@
-Name:Change of Heart
-ManaCost:W
-Types:Instant
-Text:no text
-A:SP$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't attack. | IsCurse$ True | SpellDescription$ Target creature can't attack this turn.
-SVar:Buyback:3
-SVar:PlayMain1:TRUE
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/change_of_heart.jpg
-SetInfo:STH|Common|http://magiccards.info/scans/en/sh/103.jpg
+Name:Change of Heart
+ManaCost:W
+Types:Instant
+Text:no text
+A:SP$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't attack. | IsCurse$ True | SpellDescription$ Target creature can't attack this turn.
+SVar:Buyback:3
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/change_of_heart.jpg
+SetInfo:STH|Common|http://magiccards.info/scans/en/sh/103.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/cunning.txt b/res/cardsfolder/cunning.txt
index 2f0cff75113..da34fe7372c 100644
--- a/res/cardsfolder/cunning.txt
+++ b/res/cardsfolder/cunning.txt
@@ -1,15 +1,14 @@
-Name:Cunning
-ManaCost:1 U
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-K:enPump:+3/+3
-T:Mode$ Attacks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | DelayedTrigger$ DelayedTrig | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
-T:Mode$ Blocks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield| DelayedTrigger$ DelayedTrig | Secondary$ True | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
-SVar:DelayedTrig:Mode$ Phase | Phase$ Cleanup | ValidPlayer$ Each | Execute$ TrigSac | TriggerDescription$ Sacrifice CARDNAME.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
-SVar:PlayMain1:TRUE
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cunning.jpg
-SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/28.jpg
+Name:Cunning
+ManaCost:1 U
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+K:enPump:+3/+3
+T:Mode$ Attacks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | DelayedTrigger$ DelayedTrig | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
+T:Mode$ Blocks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield| DelayedTrigger$ DelayedTrig | Secondary$ True | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
+SVar:DelayedTrig:Mode$ Phase | Phase$ Cleanup | ValidPlayer$ Each | Execute$ TrigSac | TriggerDescription$ Sacrifice CARDNAME.
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/cunning.jpg
+SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/28.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/dark_offering.txt b/res/cardsfolder/dark_offering.txt
index 49d0458af3c..b6ccb7a9350 100644
--- a/res/cardsfolder/dark_offering.txt
+++ b/res/cardsfolder/dark_offering.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 Text:no text
 A:SP$ Destroy | Cost$ 4 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target nonblack creature. You gain 3 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
-SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal_Second_Age/dark_offering.jpg
 SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/12.jpg
diff --git a/res/cardsfolder/death_bomb.txt b/res/cardsfolder/death_bomb.txt
index 7ba90d9a502..6ee14085c86 100644
--- a/res/cardsfolder/death_bomb.txt
+++ b/res/cardsfolder/death_bomb.txt
@@ -4,7 +4,6 @@ Types:Instant
 Text:no text
 A:SP$ Destroy | Cost$ 3 B Sac<1/Creature> | ValidTgts$ Creature.nonBlack | NoRegen$ True | TgtPrompt$ Select target nonblack creature | SubAbility$ SVar=DBDrain | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. Its controller loses 2 life.
 SVar:DBDrain:DB$LoseLife | Defined$ TargetedController | LifeAmount$ 2
-SVar:PlayMain1:TRUE
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/death_bomb.jpg
diff --git a/res/cardsfolder/devour_in_shadow.txt b/res/cardsfolder/devour_in_shadow.txt
index 494defdf701..c33e2917877 100644
--- a/res/cardsfolder/devour_in_shadow.txt
+++ b/res/cardsfolder/devour_in_shadow.txt
@@ -5,8 +5,7 @@ Text:no text
 A:SP$ Destroy | Cost$ B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NoRegen$ True | SubAbility$ SVar=DBLoseLife | SpellDescription$ Destroy target creature. It can't be regenerated. You lose life equal to that creature's toughness.
 SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardToughness
-SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/5dn/en-us/card50210.jpg
 SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/46.jpg
-End
+End
diff --git a/res/cardsfolder/divine_offering.txt b/res/cardsfolder/divine_offering.txt
index a50501fa4ad..bb67c3e9265 100644
--- a/res/cardsfolder/divine_offering.txt
+++ b/res/cardsfolder/divine_offering.txt
@@ -5,7 +5,6 @@ Text:no text
 A:SP$ Destroy | Cost$ 1 W | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target artifact. You gain life equal to its converted mana cost.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
-SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/divine_offering.jpg
 SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/215.jpg
diff --git a/res/cardsfolder/earth_surge.txt b/res/cardsfolder/earth_surge.txt
index e6e41a21197..74b7162d73a 100644
--- a/res/cardsfolder/earth_surge.txt
+++ b/res/cardsfolder/earth_surge.txt
@@ -3,6 +3,7 @@ ManaCost:3 G
 Types:Enchantment
 Text:no text
 K:stPumpAll:Creature.Land:2/2:No Condition:Each land gets +2/+2 as long as it's a creature.
+SVar:RemRandomDeck:True
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/earth_surge.jpg
diff --git a/res/cardsfolder/flame_slash.txt b/res/cardsfolder/flame_slash.txt
index 4c82cb7f4d2..2846c830948 100644
--- a/res/cardsfolder/flame_slash.txt
+++ b/res/cardsfolder/flame_slash.txt
@@ -3,8 +3,7 @@ ManaCost:R
 Types:Sorcery
 Text:no text
 A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ Flame Slash deals 4 damage to target creature.
-SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flame_slash.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/145.jpg
-End
+End
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 10562cb3d16..37b8d63ce7e 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -117,7 +117,7 @@ public class GameActionUtil {
 		playCard_Ripple(c);
         playCard_Storm(sa);
 
-		playCard_Chalice_of_the_Void(c);
+		//playCard_Chalice_of_the_Void(c);
 		playCard_Vengevine(c);
 		playCard_Demigod_of_Revenge(c);
 		playCard_Standstill(c);
diff --git a/src/forge/card/abilityFactory/AbilityFactory_Counters.java b/src/forge/card/abilityFactory/AbilityFactory_Counters.java
index 870c151cbc3..a2852438087 100644
--- a/src/forge/card/abilityFactory/AbilityFactory_Counters.java
+++ b/src/forge/card/abilityFactory/AbilityFactory_Counters.java
@@ -279,7 +279,12 @@ public class AbilityFactory_Counters {
 			if (!(type.equals("P1P1") || type.equals("ICE")) && r.nextFloat() < .1 * currCounters)	
 				return false;
 		}
-
+		
+		//Don't use non P1P1/M1M1 counters before main 2 if possible
+		if(AllZone.Phase.isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases")
+				&& !(type.equals("P1P1") || type.equals("M1M1")) )
+        	return false;
+		
 		Ability_Sub subAb = sa.getSubAbility();
 		if (subAb != null)
 			chance &= subAb.chkAI_Drawback();
diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java
index ce60841771f..24482442b01 100644
--- a/src/forge/card/cardFactory/CardFactory.java
+++ b/src/forge/card/cardFactory/CardFactory.java
@@ -1365,7 +1365,7 @@ public class CardFactory implements NewConstants {
             
         }//*************** END ************ END **************************
 
-        
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Chalice of the Void")) {
             Command intoPlay = new Command() {
@@ -1378,7 +1378,7 @@ public class CardFactory implements NewConstants {
             };
             card.addComesIntoPlayCommand(intoPlay);
         }//*************** END ************ END **************************     
-        
+        */
         
         //*************** START *********** START **************************
         else if (cardName.equals("Aluren")) {