diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index c08fc6a81..c566fd9fc 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -40979,9 +40979,9 @@ type=Sorcery
 [card]
 name=Muxus, Goblin Grandee
 aicode=activate all(creature[goblin;manacost<=5;zpos<=6]|mylibrary) moveto(mybattlefield) and!( all(*[zpos<=6]|mylibrary) bottomoflibrary )!
-auto=name(Look top 6)  reveal:6 optionone name(Get goblins) target(<6>creature[goblin;manacost<=5]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) bottomoflibrary and!( all(*|reveal) bottomoflibrary )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveto(ownerbattlefield))! afterrevealedend revealend
+auto=name(Look top 6) reveal:6 optionone name(Get goblins) target(<6>creature[goblin;manacost<=5]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) bottomoflibrary and!( all(*|reveal) bottomoflibrary )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveto(ownerbattlefield))! afterrevealedend revealend
 text=When Muxus, Goblin Grandee enters the battlefield, reveal the top six cards of your library. Put all Goblin creature cards with converted mana cost 5 or less from among them onto the battlefield and the rest on the bottom of your library in a random order. -- Whenever Muxus attacks, it gets +1/+1 until end of turn for each other Goblin you control.
-auto=_ATTACKING_all(this) foreach(other goblin[attacking]|myBattlefield) 1/1 ueot
+auto=_ATTACKING_name(Get 1/1 for each other goblin) type:goblin:mybattlefieldminus1minusend/type:goblin:mybattlefieldminus1minusend ueot
 mana={4}{R}{R}
 type=Legendary Creature
 subtype=Goblin Noble
@@ -64956,8 +64956,7 @@ type=Artifact
 [/card]
 [card]
 name=Time Wipe
-auto=notatarget(creature|myBattlefield) moveto(ownerhand)
-auto=destroy all(creature)
+auto=name(Return a creature) target(creature|myBattlefield) moveto(ownerhand) and!( destroy all(creature) )!
 text=Return a creature you control to its owner's hand, then destroy all creatures.
 mana={2}{W}{W}{U}
 type=Sorcery