diff --git a/res/cardsfolder/c/calciform_pools.txt b/res/cardsfolder/c/calciform_pools.txt
index f2f231a0c62..91c316a6b4f 100644
--- a/res/cardsfolder/c/calciform_pools.txt
+++ b/res/cardsfolder/c/calciform_pools.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo W U | Amount$ ChosenX | CostDesc$ 1, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of W and/or U to your mana pool.
+SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/calciform_pools.jpg
diff --git a/res/cardsfolder/c/coalition_relic.txt b/res/cardsfolder/c/coalition_relic.txt
index 2dd60e33d5c..b8c7ff1c0b2 100644
--- a/res/cardsfolder/c/coalition_relic.txt
+++ b/res/cardsfolder/c/coalition_relic.txt
@@ -4,14 +4,11 @@ Types:Artifact
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
 A:AB$ PutCounter | Cost$ T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRepeat | TriggerDescription$ At the beginning of your precombat main phase, remove all charge counters from CARDNAME. Add one mana of any color to your mana pool for each charge counter removed this way.
-SVar:TrigRepeat:AB$ Repeat | Cost$ 0 | RepeatSubAbility$ Clear | References$ X,Y | RepeatCheckSVar$ X | RepeatSVarCompare$ GE1 | StackDescription$ None | SubAbility$ DBCleanup | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:Clear:DB$ Cleanup | ClearRemembered$ True | SubAbility$ TrigRemove
-SVar:TrigRemove:DB$ RemoveCounter | CounterType$ CHARGE | CounterNum$ 1 | RememberRemoved$ True | SubAbility$ TrigGetMana | References$ Y | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:TrigGetMana:DB$ Mana | Produced$ Any | Amount$ 1 | References$ X | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemove | TriggerDescription$ At the beginning of your precombat main phase, remove all charge counters from CARDNAME. Add one mana of any color to your mana pool for each charge counter removed this way.
+SVar:TrigRemove:AB$ RemoveCounter | Cost$ 0 | CounterType$ CHARGE | CounterNum$ All | RememberRemoved$ True | SubAbility$ TrigGetMana
+SVar:TrigGetMana:DB$ Mana | Produced$ Combo Any | Amount$ NumRemoved | References$ NumRemoved | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$RememberedSize
-SVar:Y:Count$CardCounters.CHARGE
+SVar:NumRemoved:Count$RememberedSize
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coalition_relic.jpg
diff --git a/res/cardsfolder/d/dreadship_reef.txt b/res/cardsfolder/d/dreadship_reef.txt
index dbe1e5c7e59..f4e2c8112b9 100644
--- a/res/cardsfolder/d/dreadship_reef.txt
+++ b/res/cardsfolder/d/dreadship_reef.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo U B | Amount$ ChosenX | CostDesc$ 1, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of U and/or B to your mana pool.
+SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dreadship_reef.jpg
diff --git a/res/cardsfolder/f/fungal_reaches.txt b/res/cardsfolder/f/fungal_reaches.txt
index a326b4982b3..a054d0d20a8 100644
--- a/res/cardsfolder/f/fungal_reaches.txt
+++ b/res/cardsfolder/f/fungal_reaches.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo R G | Amount$ ChosenX | CostDesc$ 1, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of R and/or G to your mana pool.
+SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fungal_reaches.jpg
diff --git a/res/cardsfolder/m/molten_slagheap.txt b/res/cardsfolder/m/molten_slagheap.txt
index b962c3d3653..18643b82f0f 100644
--- a/res/cardsfolder/m/molten_slagheap.txt
+++ b/res/cardsfolder/m/molten_slagheap.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo B R | Amount$ ChosenX | CostDesc$ 1, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of B and/or R to your mana pool.
+SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/molten_slagheap.jpg
diff --git a/res/cardsfolder/s/saltcrusted_steppe.txt b/res/cardsfolder/s/saltcrusted_steppe.txt
index 9f06514ec0a..2141a8bd342 100644
--- a/res/cardsfolder/s/saltcrusted_steppe.txt
+++ b/res/cardsfolder/s/saltcrusted_steppe.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo G W | Amount$ ChosenX | CostDesc$ 1, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of G and/or W to your mana pool.
+SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/saltcrusted_steppe.jpg
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java
index ec9b31dcc07..9a87f91a7c8 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java
@@ -537,13 +537,13 @@ class CardFactoryLands {
         } // *************** END ************ END **************************
 
         // *************** START ************ START **************************
-        else if (cardName.equals("Calciform Pools") || cardName.equals("Dreadship Reef")
+        /*else if (cardName.equals("Calciform Pools") || cardName.equals("Dreadship Reef")
                 || cardName.equals("Fungal Reaches") || cardName.equals("Molten Slagheap")
                 || cardName.equals("Saltcrusted Steppe")) {
-            /*
+
              * tap, Remove X storage counters from Calciform Pools: Add X mana
              * in any combination of W and/or U to your mana pool.
-             */
+
             final int[] num = new int[1];
             final int[] split = new int[1];
 
@@ -660,7 +660,7 @@ class CardFactoryLands {
             addMana.setAfterPayMana(runtime);
             card.addSpellAbility(addMana);
             card.addSpellAbility(abMana);
-        } // *************** END ************ END **************************
+        }*/ // *************** END ************ END **************************
 
         // *************** START *********** START **************************
         /*else if (cardName.equals("Crosis's Catacombs") || cardName.equals("Darigaaz's Caldera")