diff --git a/forge-gui/res/cardsfolder/a/angelic_arbiter.txt b/forge-gui/res/cardsfolder/a/angelic_arbiter.txt
index a6a7c70cbe7..6d929e5c8ee 100644
--- a/forge-gui/res/cardsfolder/a/angelic_arbiter.txt
+++ b/forge-gui/res/cardsfolder/a/angelic_arbiter.txt
@@ -3,7 +3,7 @@ ManaCost:5 W W
 Types:Creature Angel
 PT:5/6
 K:Flying
-S:Mode$ CantAttack | Affected$ Creature.ControlledBy Opponent.castSpellThisTurn | Description$ Each opponent who cast a spell this turn can't attack with creatures.
+S:Mode$ CantAttack | ValidCard$ Creature.ControlledBy Opponent.castSpellThisTurn | Description$ Each opponent who cast a spell this turn can't attack with creatures.
 S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Opponent.attackedWithCreaturesThisTurn | Description$ Each opponent who attacked with a creature this turn can't cast spells.
 SVar:RemMultiplayer:True
 Oracle:Flying\nEach opponent who cast a spell this turn can't attack with creatures.\nEach opponent who attacked with a creature this turn can't cast spells.
diff --git a/forge-gui/res/cardsfolder/c/crawling_barrens.txt b/forge-gui/res/cardsfolder/c/crawling_barrens.txt
index ad52fcdec67..9da7187f82f 100755
--- a/forge-gui/res/cardsfolder/c/crawling_barrens.txt
+++ b/forge-gui/res/cardsfolder/c/crawling_barrens.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 4 | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBAnimate | AILogic$ CrawlingBarrens | SpellDescription$ Put two +1/+1 counters on CARDNAME. Then you may have it become a 0/0 Elemental creature until end of turn. It's still a land.
-SVar:DBAnimate:DB$ Animate | Defined$ Self | Power$ 0 | Toughness$ 0 | Types$ Creature,Elemental | Optional$ True
+SVar:DBAnimate:DB$ Animate | Defined$ Self | Power$ 0 | Toughness$ 0 | Types$ Creature,Elemental | Optional$ True | StackDescription$ Then you may have it become a 0/0 Elemental creature until end of turn. It's still a land.
 DeckHas:Ability$Counters
 Oracle:{T}: Add {C}.\n{4}: Put two +1/+1 counters on Crawling Barrens. Then you may have it become a 0/0 Elemental creature until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/d/delay.txt b/forge-gui/res/cardsfolder/d/delay.txt
index 3589bce134c..6177dfe82ae 100644
--- a/forge-gui/res/cardsfolder/d/delay.txt
+++ b/forge-gui/res/cardsfolder/d/delay.txt
@@ -1,9 +1,9 @@
 Name:Delay
 ManaCost:1 U
 Types:Instant
-A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | RememberCountered$ True | Destination$ Exile | SubAbility$ DBPutCounter | SpellDescription$ Counter target spell. If the spell is countered this way, exile it with three time counters on it instead of putting it into its owner's graveyard. If it doesn't have suspend, it gains suspend. (At the beginning of its owner's upkeep, remove a time counter from that card. When the last is removed, the player plays it without paying its mana cost. If it's a creature, it has haste.)
+A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | RememberCountered$ True | Destination$ Exile | SubAbility$ DBPutCounter | SpellDescription$ Counter target spell. If the spell is countered this way, exile it with three time counters on it instead of putting it into its owner's graveyard. If it doesn't have suspend, it gains suspend. (At the beginning of its owner's upkeep, remove a time counter from that card. When the last is removed, the player plays it without paying its mana cost. If it's a creature, it has haste.)
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterNum$ 3 | CounterType$ TIME | SubAbility$ DBPump
-SVar:DBPump:DB$ PumpAll | ValidCards$ Card.IsRemembered+withoutSuspend | PumpZone$ Exile | KW$ Suspend | Duration$ Permanent | SubAbility$ DBCleanup | StackDescription$ If it doesn't have suspend, it gains suspend.
+SVar:DBPump:DB$ Pump | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.withoutSuspend | PumpZone$ Exile | KW$ Suspend | Duration$ Permanent | SubAbility$ DBCleanup | StackDescription$ If it doesn't have suspend, it gains suspend.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/delay.jpg
+DeckHas:Ability$Counters
 Oracle:Counter target spell. If the spell is countered this way, exile it with three time counters on it instead of putting it into its owner's graveyard. If it doesn't have suspend, it gains suspend. (At the beginning of its owner's upkeep, remove a time counter from that card. When the last is removed, the player plays it without paying its mana cost. If it's a creature, it has haste.)
diff --git a/forge-gui/res/cardsfolder/n/naya_soulbeast.txt b/forge-gui/res/cardsfolder/n/naya_soulbeast.txt
index b962a79ca6e..ef587395942 100644
--- a/forge-gui/res/cardsfolder/n/naya_soulbeast.txt
+++ b/forge-gui/res/cardsfolder/n/naya_soulbeast.txt
@@ -2,15 +2,14 @@ Name:Naya Soulbeast
 ManaCost:6 G G
 Types:Creature Beast
 PT:0/0
-K:Trample
-T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigRepeat | TriggerDescription$ Trample
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigRepeat | TriggerDescription$ When you cast this spell, each player reveals the top card of their library.
 SVar:TrigRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBReveal
 SVar:DBReveal:DB$ Dig | Defined$ Player.IsRemembered | DigNum$ 1 | Reveal$ True | NoMove$ True | RememberRevealed$ True
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ SoulbestETB | Secondary$ True | Description$ CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the total mana value of all cards revealed this way.
-SVar:SoulbestETB:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | SubAbility$ SoulbestCounters
-SVar:SoulbestCounters:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
+K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the total mana value of all cards revealed this way.
+SVar:X:Remembered$SumCMC
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$CardManaCost
+K:Trample
 AI:RemoveDeck:Random
-SVar:Picture:http://www.wizards.com/global/images/magic/general/naya_soulbeast.jpg
+DeckHas:Ability$Counters
 Oracle:When you cast this spell, each player reveals the top card of their library. Naya Soulbeast enters the battlefield with X +1/+1 counters on it, where X is the total mana value of all cards revealed this way.\nTrample
diff --git a/forge-gui/res/cardsfolder/upcoming/suspend.txt b/forge-gui/res/cardsfolder/upcoming/suspend.txt
index 05857c8994f..a899f7451fd 100644
--- a/forge-gui/res/cardsfolder/upcoming/suspend.txt
+++ b/forge-gui/res/cardsfolder/upcoming/suspend.txt
@@ -1,7 +1,8 @@
 Name:Suspend
 ManaCost:U
 Types:Instant
-A:SP$ ChangeZone | A:SP$ ChangeZone | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBPutCounter | SpellDescription$ Exile target creature and put two time counters on it. If it doesn't have suspend, it gains suspend.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterNum$ 2 | CounterType$ TIME | SubAbility$ DBPump
-SVar:DBPump:DB$ PumpAll | ValidCards$ Card.IsRemembered+withoutSuspend | PumpZone$ Exile | KW$ Suspend | Permanent$ True | SubAbility$ DBCleanup | StackDescription$ If it doesn't have suspend, it gains suspend.
+A:SP$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | WithCountersType$ TIME | WithCountersAmount$ 2 | RememberChanged$ True | SubAbility$ DBPump | StackDescription$ Exile {c:Targeted} and put two time counters on it. | SpellDescription$ Exile target creature and put two time counters on it. If it doesn't have suspend, it gains suspend.
+SVar:DBPump:DB$ Pump | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.withoutSuspend | PumpZone$ Exile | KW$ Suspend | Duration$ Permanent | SubAbility$ DBCleanup | StackDescription$ If it doesn't have suspend, it gains suspend.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters
 Oracle:Exile target creature and put two time counters on it. If it doesn't have suspend, it gains suspend. (At the beginning of its owner's upkeep, remove a time counter from that card. When the last is removed, the player plays it without paying its mana cost. If it's a creature, it has haste.)