diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 350198e54..57d32aa71 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -4367,7 +4367,7 @@ type=Instant
 [/card]
 [card]
 name=Boar
-auto=@movedto(ownergraveyard) from(ownerbattlefield):token(-473141)
+auto=@movedto(this|ownergraveyard) from(battlefield):token(-473141)
 text=When this creature dies, create a Food token. (A Food token is an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 type=Creature
 subtype=Boar
@@ -6375,9 +6375,9 @@ subtype=Saga
 [card]
 name=Chainweb Aracnir
 abilities=reach
+auto=if paid(alternative) then counter(1/1,3)
 auto=target(creature[flying]|opponentBattlefield) name(Deals damage to a creature) dynamicability<!powerstrike!>
-autograveyard=name(Escape-{3}{G}{G},exile four) {3}{G}{G}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,3)
+autograveyard={3}{G}{G}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{3}{G}{G},exile four) activate castcard(alternative)
 text=Reach -- When Chainweb Aracnir enters the battlefield, it deals damage equal to its power to target creature with flying an opponent controls. -- Escape—{3}{G}{G}, Exile four other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Chainweb Aracnir escapes with three +1/+1 counters on it.
 mana={G}
 type=Creature
@@ -7414,7 +7414,7 @@ toughness=2
 name=Cling to Dust
 auto=choice name(exile non-creature card) moveTo(exile) target(*[-creature]|Graveyard) && draw:1 controller
 auto=choice name(exile creature card) moveTo(exile) target(creature|Graveyard) && life:3 controller
-autograveyard=name(Escape-{3}{B},exile five) {3}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={3}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{3}{B},exile five) activate castcard(normal)
 text=Exile target card from a graveyard. If it was a creature card, you gain 3 life. Otherwise, you draw a card. -- Escape—{3}{B}, Exile five other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={B}
 type=Instant
@@ -13154,7 +13154,7 @@ name=Escape Velocity
 target=creature
 auto=haste
 auto=1/0
-autograveyard=name(Escape-{1}{R},exile two) {1}{R}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={1}{R}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{1}{R},exile two) activate castcard(normal)
 text=Enchant creature -- Enchanted creature gets +1/+0 and has haste. -- Escape—{1}{R}, Exile two other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={R}
 type=Enchantment
@@ -13703,8 +13703,8 @@ toughness=1
 [/card]
 [card]
 name=Fabled Passage
-auto=aslongas(land|myBattlefield)~morethan~2 {T}{S}:name(search card) reveal:plibrarycount optionone name(choose card) target(land[basic]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(untap(noevent))!)! afterrevealedend revealend
-auto=aslongas(land|myBattlefield)~lessthan~3 {T}{S}:name(search card) reveal:plibrarycount optionone name(choose card) target(land[basic]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(tap(noevent))!)! afterrevealedend revealend
+auto={T}{S}:restriction{type(land|myBattlefield)~morethan~3} name(search card) reveal:plibrarycount optionone name(choose card) target(land[basic]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield))! afterrevealedend revealend
+auto={T}{S}:restriction{type(land|myBattlefield)~lessthan~4} name(search card) reveal:plibrarycount optionone name(choose card) target(land[basic]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(tap(noevent))!)! afterrevealedend revealend
 text={T}, Sacrifice Fabled Passage: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. Then if you control four or more lands, untap that land.
 type=Land
 [/card]
@@ -15744,7 +15744,7 @@ toughness=2
 name=Fruit of Tizerus
 target=player
 auto=life:-2
-autograveyard=name(Escape-{3}{B},exile three) {3}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={3}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{3}{B},exile three) activate castcard(normal)
 text=Target player loses 2 life. Escape—{3}{B}, Exile three other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={B}
 type=Instant
@@ -16927,7 +16927,7 @@ toughness=3
 [card]
 name=Glimpse of Freedom
 auto=draw:1
-autograveyard=name(Escape-{2}{U},exile five) {2}{U}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={2}{U}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{2}{U},exile five) activate castcard(normal)
 text=Draw a card. -- Escape—{2}{U}, Exile five other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={1}{U}
 type=Instant
@@ -24832,8 +24832,8 @@ toughness=3
 [/card]
 [card]
 name=Loathsome Chimera
-autograveyard=name(Escape-{4}{G},three) {4}{G}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,1)
+auto=if paid(alternative) then counter(1/1,1)
+autograveyard={4}{G}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{4}{G},three) activate castcard(alternative)
 text=Escape—{4}{G}, exile three other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Loathsome Chimera escapes with a +1/+1 counter on it.
 mana={2}{G}
 type=Creature
@@ -27172,7 +27172,7 @@ text=Destroy all creatures target player controls. For each creature that died t
 name=Mogis's Favor
 target=creature
 auto=2/-1
-autograveyard=name(Escape-{2}{B},exile two) {2}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={2}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{2}{B},exile two) activate castcard(normal)
 text=Enchant creature -- Enchanted creature gets +2/-1. -- Escape—{2}{B}, Exile two other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={B}
 type=Enchantment
@@ -30461,8 +30461,8 @@ subtype=Aura Curse
 [card]
 name=Ox of Agonas
 auto=reject all(*|myhand) && draw:3 controller
-autograveyard=name(Escape-{R}{R},exile eight) {R}{R}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,1)
+auto=if paid(alternative) then counter(1/1,1)
+autograveyard={R}{R}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{R}{R},exile eight) activate castcard(alternative)
 text=When Ox of Agonas enters the battlefield, discard your hand, then draw three cards. -- Escape—{R}{R}, Exile eight other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Ox of Agonas escapes with a +1/+1 counter on it.
 mana={3}{R}{R}
 type=Creature
@@ -31077,8 +31077,9 @@ type=Instant
 [/card]
 [card]
 name=Pharika's Spawn
-autograveyard=name(Escape-{5}{B},exile three) {5}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,2) && NotATarget(creature[-Gorgon]|opponentbattlefield) sacrifice
+auto=if paid(alternative) then counter(1/1,2)
+auto=if paid(alternative) then ability$!name(sacrifice non-gorgon) notatarget(creature[-Gorgon]|mybattlefield) sacrifice!$ opponent
+autograveyard={5}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{5}{B},exile three) activate castcard(alternative)
 text=Escape—{5}{B}, Exile three other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Pharika’s Spawn escapes with two +1/+1 counters on it. When it enters the battlefield this way, each opponent sacrifices a non-Gorgon creature.
 mana={3}{B}
 type=Creature
@@ -31110,8 +31111,8 @@ toughness=4
 name=Phoenix of Ash
 abilities=flying,haste
 auto={2}{R}:2/0 ueot
-autograveyard=name(Escape-{2}{R}{R},exile three) {2}{R}{R}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,1)
+autograveyard={2}{R}{R}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{2}{R}{R},exile three) activate castcard(alternative)
+auto=if paid(alternative) then counter(1/1,1)
 text=Flying, haste -- {2}{R}: Phoenix of Ash gets +2/+0 until end of turn. -- Escape—{2}{R}{R}, Exile three other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Phoenix of Ash escapes with a +1/+1 counter on it.
 mana={1}{R}{R}
 type=Creature
@@ -31572,10 +31573,10 @@ toughness=3
 name=Polukranos, Unchained
 abilities=hydra
 auto=counter(1/1,6)
+auto=if paid(alternative) then counter(1/1,6)
 auto={1}{B}{G}:name(Fight) transforms((,newability[target(other creature) dynamicability<!powerstrike eachother!>])) oneshot
-autograveyard=name(Escape-{4}{B}{G},exile six) {4}{B}{G}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,12)
-text=Polukranos enters the battlefield with six +1/+1 counters on it. It escapes with twelve +1/+1 counters on it instead. -- If damage would be dealt to Polukranos while it has a +1/+1 counter on it, prevent that damage and remove that many +1/+1 counters from it. -- 1 -- {B} -- {G} -- : Polukranos fights another target creature. -- Escape— 4{B}{G}, Exile six other cards from your graveyard.
+autograveyard={4}{B}{G}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{4}{B}{G},exile six) activate castcard(alternative)
+text=Polukranos enters the battlefield with six +1/+1 counters on it. It escapes with twelve +1/+1 counters on it instead. -- If damage would be dealt to Polukranos while it has a +1/+1 counter on it, prevent that damage and remove that many +1/+1 counters from it. -- {1}{B}{G}: Polukranos fights another target creature. -- Escape—{4}{B}{G}, Exile six other cards from your graveyard.
 mana={2}{B}{G}
 type=Legendary Creature
 subtype=Zombie Hydra
@@ -36169,7 +36170,7 @@ toughness=1
 [card]
 name=Satyr's Cunning
 auto=token(Satyr,Creature Satyr,1/1,red,cantblock)
-autograveyard=name(Escape-{2}{R},exile two) {2}{U}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={2}{U}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{2}{R},exile two) activate castcard(normal)
 text=Create a 1/1 red Satyr creature token with “This creature can’t block.” -- Escape—{2}{R}, Exile two other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={R}
 type=Sorcery
@@ -37310,7 +37311,7 @@ name=Sentinel's Eyes
 target=creature
 auto=vigilance
 auto=1/1
-autograveyard=name(Escape-{W}, exile two) {W}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={W}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{W}, exile two) activate castcard(normal)
 text=Enchant creature -- Enchanted creature gets +1/+1 and has vigilance. -- Escape—{W}, Exile two other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={W}
 type=Enchantment
@@ -39455,7 +39456,7 @@ name=Sleep of the Dead
 target=creature|battlefield
 auto=tap
 auto=frozen
-autograveyard=name(Escape-{2}{U},exile three) {2}{U}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={2}{U}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{2}{U},exile three) activate castcard(normal)
 text=Tap target creature. It doesn’t untap during its controller’s next untap step. -- Escape—{2}{U}, Exile three other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={U}
 type=Sorcery
@@ -42711,7 +42712,7 @@ toughness=5
 [card]
 name=Sweet Oblivion
 auto=deplete:4 target(player)
-autograveyard=name(Escape-{3}{U},exile four) {3}{U}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
+autograveyard={3}{U}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{3}{U},exile four) activate castcard(normal)
 text=Target player puts the top four cards of their library into their graveyard. -- Escape—{3}{U}, Exile four other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={1}{U}
 type=Sorcery
@@ -44163,9 +44164,15 @@ subtype=Saga
 [/card]
 [card]
 name=The Great Henge
-auto=changecost(colorless:-power:highest:*:mybattlefield) forcedalive
-auto={T}add{G}{G} && life:2 controller
-auto=@movedto(creature[-token]|mybattlefield):all(trigger[from]) counter(1/1,1) && draw:1
+anyzone=if compare(power:highest:creature:mybattlefield)~equalto~1 then changecost(colorless:-1) forcedalive
+anyzone=if compare(power:highest:creature:mybattlefield)~equalto~2 then changecost(colorless:-2) forcedalive
+anyzone=if compare(power:highest:creature:mybattlefield)~equalto~3 then changecost(colorless:-3) forcedalive
+anyzone=if compare(power:highest:creature:mybattlefield)~equalto~4 then changecost(colorless:-4) forcedalive
+anyzone=if compare(power:highest:creature:mybattlefield)~equalto~5 then changecost(colorless:-5) forcedalive
+anyzone=if compare(power:highest:creature:mybattlefield)~equalto~6 then changecost(colorless:-6) forcedalive
+anyzone=if compare(power:highest:creature:mybattlefield)~equalto~7 then changecost(colorless:-7) forcedalive
+auto={T}:add{G}{G} && life:2 controller
+auto=@movedto(creature[-token]|mybattlefield):all(trigger[to]) counter(1/1,1) && draw:1 controller
 text=This spell costs {X} less to cast, where X is the greatest power among creatures you control. -- {T}: Add {G}{G}. You gain 2 life. -- Whenever a nontoken creature enters the battlefield under your control, put a +1/+1 counter on it and draw a card.
 mana={7}{G}{G}
 type=Legendary Artifact
@@ -46558,8 +46565,8 @@ type=Enchantment
 [card]
 name=Underworld Charger
 abilities=cantblock
-autograveyard=name(Escape-{4}{B},exile three) {4}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,2)
+autograveyard={4}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{4}{B},exile three) activate castcard(alternative)
+auto=if paid(alternative) then counter(1/1,2)
 text=Underworld Charger can’t block. -- Escape—{4}{B}, Exile three other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Underworld Charger escapes with two +1/+1 counters on it.
 mana={2}{B}
 type=Creature
@@ -46578,8 +46585,8 @@ type=Sorcery
 [card]
 name=Underworld Rage-Hound
 abilities=mustattack
-autograveyard=name(Escape-{3}{R},exile three) {3}{R}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,2)
+autograveyard={3}{R}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{3}{R},exile three) activate castcard(alternative)
+auto=if paid(alternative) then counter(1/1,1)
 text=Underworld Rage-Hound attacks each combat if able. -- Escape—{3}{R}, Exile three other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Underworld Rage-Hound escapes with a +1/+1 counter on it.
 mana={1}{R}
 type=Creature
@@ -46885,14 +46892,13 @@ toughness=3
 [/card]
 [card]
 name=Uro, Titan of Nature's Wrath
-other={G}{G}{U}{U}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)} name(Escape)
 auto=ifnot paid(alternative) then sacrifice
 auto=life:3 controller && draw:1 controller
 auto=may moveto(mybattlefield) target(land|myhand)
 auto=@combat(attacking) source(this):life:3 controller && draw:1 controller
 auto=@combat(attacking) source(this):may moveto(mybattlefield) target(land|myhand)
-autograveyard={G}{G}{U}{U}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)}:activate castcard(alternative)
-text=When Uro enters the battlefield, sacrifice it unless it escaped. -- Whenever Uro enters the battlefield or attacks, you gain 3 life and draw a card, then you may put a land card from your hand onto the battlefield. -- Escape— {G}{G}{U}{U}, Exile five other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
+autograveyard={G}{G}{U}{U}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)}{E(*|mygraveyard)}:name(Escape-{G}{G}{U}{U},exile five) activate castcard(alternative)
+text=When Uro enters the battlefield, sacrifice it unless it escaped. -- Whenever Uro enters the battlefield or attacks, you gain 3 life and draw a card, then you may put a land card from your hand onto the battlefield. -- Escape — {G}{G}{U}{U}, Exile five other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
 mana={1}{G}{U}
 type=Legendary Creature
 subtype=Elder Giant
@@ -48337,8 +48343,8 @@ toughness=4
 [/card]
 [card]
 name=Voracious Typhon
-autograveyard=name(Escape-{5}{G}{G},exile four) {5}{G}{G}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,3)
+autograveyard={5}{G}{G}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{5}{G}{G},exile four) activate castcard(alternative)
+auto=if paid(alternative) then counter(1/1,3)
 text=Escape—{5}{G}{G}, Exile four other cards from your graveyard. (You may cast this spell from your graveyard for its escape cost.) -- Voracious Typhon escapes with three +1/+1 counters on it.
 mana={2}{G}{G}
 type=Creature
@@ -49284,7 +49290,7 @@ type=Instant
 [card]
 name=Wildborn Preserver
 abilities=flash,reach
-auto=@movedTo(other creature[-human]|myBattlefield):{X}:counter(1/1,X)
+auto=@movedTo(other creature[-human]|myBattlefield):name(Pay X and put X counter) may pay({x}) name(Pay X and put X counter) name(Pay X and put X counter) counter(1/1,X) all(this)
 text=Flash -- Reach -- Whenever another non-Human creature enters the battlefield under your control, you may pay {X}. When you do, put X +1/+1 counters on Wildborn Preserver.
 mana={1}{G}
 type=Creature
@@ -49749,8 +49755,8 @@ type=Instant
 name=Woe Strider
 auto=token(Goat,Creature Goat,0/1,white)
 auto={S(other creature|myBattlefield}:scry:1 scrycore delayed dontshow donothing scrycoreend scryend
-autograveyard=name(Escape-{3}{B}{B},exile four) {3}{B}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:castcard(normal)
-auto=@movedTo(this|mybattlefield) from(mygraveyard):counter(1/1,2)
+autograveyard={3}{B}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}:name(Escape-{3}{B}{B},exile four) activate castcard(alternative)
+auto=if paid(alternative) then counter(1/1,2)
 text=When Woe Strider enters the battlefield, create a 0/1 white Goat creature token. -- Sacrifice another creature: Scry 1. -- Escape—{3}{B}{B}, Exile four other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Woe Strider escapes with two +1/+1 counters on it.
 mana={2}{B}
 type=Creature
@@ -49794,7 +49800,7 @@ toughness=3
 [/card]
 [card]
 name=Wolf Gar
-auto=@movedto(ownergraveyard) from(ownerbattlefield):counter(0/0,1,loyalty) all(Garruk)
+auto=@movedto(this|ownergraveyard) from(battlefield):counter(0/0,1,loyalty) all(Garruk)
 text=When this creature dies, put a loyalty counter on each Garruk you control.
 type=Creature
 subtype=Wolf
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index ab03820c6..360820454 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -839,9 +839,9 @@ subtype=Garruk
 [card]
 name=Garruk, Cursed Huntsman
 auto=counter(0/0,5,loyalty)
-auto={C(0/0,0,Loyalty)}:name(+0: Wolf) token(Wolf Gar)
+auto={C(0/0,0,Loyalty)}:name(+0: Wolf) token(Wolf Gar)*2
 auto={C(0/0,-3,Loyalty)}:name(-3: Destroy) target(creature) destroy && draw:1 controller
-auto={C(0/0,-6,Loyalty)}:name(-6: Emblem) emblem transforms((,newability[lord(creature|mybattlefield)trample],newability[lord(creature|mybattlefield) 3/3])) forever dontremove
+auto={C(0/0,-6,Loyalty)}:name(-6: Emblem) emblem transforms((,newability[lord(creature|mybattlefield) trample],newability[lord(creature|mybattlefield) 3/3])) forever dontremove
 text=0: Create two 2/2 black and green Wolf creature tokens with "When this creature dies, put a loyalty counter on each Garruk you control." -- -3: Destroy target creature. Draw a card. -- -6: You get an emblem with "Creatures you control get +3/+3 and have trample."
 mana={4}{B}{G}
 type=Legendary Planeswalker
diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 0f660e74e..21962ec52 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -4140,8 +4140,6 @@ public:
             setTokenOwner();
             tokenReciever->game->temp->addCard(myToken);
             Spell * spell = NEW Spell(game, myToken);
-            spell->resolve();
-            myToken = spell->source;
             spell->source->owner = tokenReciever;
             spell->source->lastController = tokenReciever;
             spell->source->isToken = 1;
@@ -4156,6 +4154,8 @@ public:
                     spell->source->setMTGId(-((MTGCardInstance*)source)->storedSourceCard->getMTGId());
                 }
             }
+            spell->resolve();
+            myToken = spell->source;
             if(aLivingWeapon)
             {
                 livingWeaponToken(spell->source);