diff --git a/forge-gui/res/cardsfolder/m/magmasaur.txt b/forge-gui/res/cardsfolder/m/magmasaur.txt
index fda6fea6186..7ff2084cc64 100644
--- a/forge-gui/res/cardsfolder/m/magmasaur.txt
+++ b/forge-gui/res/cardsfolder/m/magmasaur.txt
@@ -3,14 +3,11 @@ ManaCost:3 R R
 Types:Creature Elemental Lizard
 PT:0/0
 K:etbCounter:P1P1:5
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ Choices | TriggerDescription$ At the beginning of your upkeep, you may remove a +1/+1 counter from CARDNAME. If you don't, sacrifice CARDNAME and it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
-SVar:Choices:AB$ GenericChoice | Cost$ 0 | Choices$ Shrink,SelfDestruct | Defined$ You
-SVar:Shrink:DB$ RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | UpTo$ True | RememberRemoved$ True | SubAbility$ SelfDestruct | SpellDescription$ Remove a +1/+1 counter from CARDNAME.
-SVar:SelfDestruct:DB$ Sacrifice | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X | SubAbility$ LetEmHaveIt | SpellDescription$ Sacrifice CARDNAME and it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
-SVar:LetEmHaveIt:DB$ DamageAll | ValidCards$ Creature.withoutFlying | ValidPlayers$ Player | NumDmg$ Y | References$ Y | SubAbility$ DBCleanup | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ SelfDestruct | TriggerDescription$ At the beginning of your upkeep, you may remove a +1/+1 counter from CARDNAME. If you don't, sacrifice CARDNAME and it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
+SVar:SelfDestruct:DB$ Sacrifice | Defined$ Self | RememberSacrificed$ True | UnlessCost$ SubCounter<1/P1P1> | UnlessPayer$ You | SubAbility$ LetEmHaveIt
+SVar:LetEmHaveIt:DB$ DamageAll | ValidCards$ Creature.withoutFlying | ValidPlayers$ Player | NumDmg$ X | References$ X | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$RememberedSize
-SVar:Y:Count$CardCounters.P1P1
+SVar:X:Count$CardCounters.P1P1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magmasaur.jpg
 Oracle:Magmasaur enters the battlefield with five +1/+1 counters on it.\nAt the beginning of your upkeep, you may remove a +1/+1 counter from Magmasaur. If you don't, sacrifice Magmasaur and it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.