diff --git a/forge-gui/res/cardsfolder/c/centaur_vinecrasher.txt b/forge-gui/res/cardsfolder/c/centaur_vinecrasher.txt
index 37836895579..66a7df9d024 100644
--- a/forge-gui/res/cardsfolder/c/centaur_vinecrasher.txt
+++ b/forge-gui/res/cardsfolder/c/centaur_vinecrasher.txt
@@ -6,7 +6,7 @@ K:Trample
 K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with a +1/+1 counter on it for each land card in all graveyards.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | TriggerZones$ Graveyard | ValidCard$ Card.nonToken+Land | Execute$ TrigReturn | TriggerDescription$ Whenever a land card is put into a graveyard from anywhere, you may pay {G}{G}. If you do, return CARDNAME from your graveyard to your hand.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ G G | Defined$ Self | Origin$ Graveyard | Destination$ Hand 
-SVar:X:Count$TypeInAllYards.Land
+SVar:X:Count$LastStateGraveyard Land
 SVar:RemRandomDeck:True 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/centaur_vinecrasher.jpg
 Oracle:Trample\nCentaur Vinecrasher enters the battlefield with a number of +1/+1 counters on it equal to the number of land cards in all graveyards.\nWhenever a land card is put into a graveyard from anywhere, you may pay {G}{G}. If you do, return Centaur Vinecrasher from your graveyard to your hand.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/diregraf_colossus.txt b/forge-gui/res/cardsfolder/d/diregraf_colossus.txt
index 55be118cde9..ba4ec5553a1 100644
--- a/forge-gui/res/cardsfolder/d/diregraf_colossus.txt
+++ b/forge-gui/res/cardsfolder/d/diregraf_colossus.txt
@@ -3,11 +3,10 @@ ManaCost:2 B
 Types:Creature Zombie Giant
 PT:2/2
 K:etbCounter:P1P1:X:no Condition:Diregraf Colossus enters the battlefield with a +1/+1 counter on it for each Zombie card in your graveyard.
-SVar:X:Count$TypeInYourYard.Zombie
+SVar:X:Count$LastStateGraveyard Zombie.YouCtrl
 T:Mode$ SpellCast | ValidCard$ Zombie | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast a Zombie spell, put a 2/2 black Zombie creature token onto the battlefield tapped.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie SOI | TokenTapped$ True | TokenOwner$ You 
 SVar:BuffedBy:Zombie
 DeckHints:Type$Zombie
 SVar:Picture:http://www.wizards.com/global/images/magic/general/diregraf_colossus.jpg
-Oracle:Diregraf Colossus enters the battlefield with a +1/+1 counter on it for each Zombie card in your graveyard.\nWhenever you cast a Zombie spell, put a 2/2 black Zombie creature token onto the battlefield tapped.
-
+Oracle:Diregraf Colossus enters the battlefield with a +1/+1 counter on it for each Zombie card in your graveyard.\nWhenever you cast a Zombie spell, put a 2/2 black Zombie creature token onto the battlefield tapped.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/drakestown_forgotten.txt b/forge-gui/res/cardsfolder/d/drakestown_forgotten.txt
index e2b0cc112cf..8e8dfff726e 100644
--- a/forge-gui/res/cardsfolder/d/drakestown_forgotten.txt
+++ b/forge-gui/res/cardsfolder/d/drakestown_forgotten.txt
@@ -3,7 +3,7 @@ ManaCost:4 B
 Types:Creature Zombie
 PT:0/0
 K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the number of creature cards in all graveyards.
-SVar:X:Count$TypeInAllYards.Creature
+SVar:X:Count$LastStateGraveyard Creature
 SVar:NeedsToPlayVar:X GE4
 A:AB$ Pump | Cost$ 2 B SubCounter<1/P1P1> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drakestown_forgotten.jpg
diff --git a/forge-gui/res/cardsfolder/g/golgari_grave_troll.txt b/forge-gui/res/cardsfolder/g/golgari_grave_troll.txt
index 6084a49a938..9a222fc80b9 100644
--- a/forge-gui/res/cardsfolder/g/golgari_grave_troll.txt
+++ b/forge-gui/res/cardsfolder/g/golgari_grave_troll.txt
@@ -5,7 +5,7 @@ PT:0/0
 K:etbCounter:P1P1:X:no Condition:Golgari Grave-Troll enters the battlefield with a +1/+1 counter on it for each creature card in your graveyard.
 A:AB$ Regenerate | Cost$ 1 SubCounter<1/P1P1> | SpellDescription$ Regenerate CARDNAME.
 K:Dredge 6
-SVar:X:Count$TypeInYourYard.Creature
-SVar:NeedsToPlayVar:X GE1
+SVar:X:Count$LastStateGraveyard Creature.YouCtrl
+SVar:NeedsToPlayVar:X GE3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golgari_grave_troll.jpg
 Oracle:Golgari Grave-Troll enters the battlefield with a +1/+1 counter on it for each creature card in your graveyard.\n{1}, Remove a +1/+1 counter from Golgari Grave-Troll: Regenerate Golgari Grave-Troll.\nDredge 6 (If you would draw a card, instead you may put exactly six cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)
diff --git a/forge-gui/res/cardsfolder/u/unbreathing_horde.txt b/forge-gui/res/cardsfolder/u/unbreathing_horde.txt
index 9a020bed61c..cc35bff9857 100644
--- a/forge-gui/res/cardsfolder/u/unbreathing_horde.txt
+++ b/forge-gui/res/cardsfolder/u/unbreathing_horde.txt
@@ -6,7 +6,7 @@ K:etbCounter:P1P1:X:no Condition:Unbreathing Horde enters the battlefield with a
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.Self | ReplaceWith$ DBRemoveCounters | PreventionEffect$ True | Description$ If damage would be dealt to CARDNAME, prevent that damage. Remove a +1/+1 counter from CARDNAME.
 SVar:DBRemoveCounters:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:X:Count$Valid Zombie.YouCtrl+Other/Plus.Y
-SVar:Y:Count$TypeInYourYard.Zombie
+SVar:Y:Count$LastStateGraveyard Zombie.YouCtrl
 SVar:NeedsToPlayVar:X GE1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unbreathing_horde.jpg
diff --git a/forge-gui/res/cardsfolder/u/undergrowth_scavenger.txt b/forge-gui/res/cardsfolder/u/undergrowth_scavenger.txt
index a195eb7f48d..fb677b94486 100644
--- a/forge-gui/res/cardsfolder/u/undergrowth_scavenger.txt
+++ b/forge-gui/res/cardsfolder/u/undergrowth_scavenger.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Creature Fungus Horror
 PT:0/0
 K:etbCounter:P1P1:Y:no Condition:CARDNAME enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in all graveyards.
-SVar:Y:Count$ValidGraveyard Creature
+SVar:Y:Count$LastStateGraveyard Creature
 SVar:NeedsToPlayVar:Y GE4
 SVar:Picture:http://www.wizards.com/global/images/magic/general/undergrowth_scavenger.jpg
 Oracle:Undergrowth Scavenger enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in all graveyards.
diff --git a/forge-gui/res/cardsfolder/z/zombie_mob.txt b/forge-gui/res/cardsfolder/z/zombie_mob.txt
index a2f516b6630..773e852e07a 100644
--- a/forge-gui/res/cardsfolder/z/zombie_mob.txt
+++ b/forge-gui/res/cardsfolder/z/zombie_mob.txt
@@ -5,7 +5,7 @@ PT:2/0
 K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with a +1/+1 counter on it for each creature card in your graveyard.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigExileAll | TriggerDescription$ When CARDNAME enters the battlefield, exile all creature cards from your graveyard.
 SVar:TrigExileAll:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Exile
-SVar:X:Count$TypeInYourYard.Creature
+SVar:X:Count$LastStateGraveyard Creature
 SVar:NeedsToPlayVar:X GE2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zombie_mob.jpg
 Oracle:Zombie Mob enters the battlefield with a +1/+1 counter on it for each creature card in your graveyard.\nWhen Zombie Mob enters the battlefield, exile all creature cards from your graveyard.