diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index d1d1dc843..6626d737a 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -426,6 +426,14 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+name=Uba Mask
+auto=replacedraw name(uba mask) reveal:1 optionone all(*|reveal) moveto(exile) and!( transforms((,newability[canplayfromexile])) ueot)! optiononeend revealend
+auto=opponentreplacedraw name(uba mask) reveal:1 revealzone(opponentlibrary) optionone all(*|reveal) moveto(exile) and!( transforms((,newability[canplayfromexile])) ueot)! optiononeend revealend
+text=If a player would draw a card, that player exiles that card face up instead. -- Each player may play cards he or she exiled with Uba Mask this turn.
+mana={4}
+type=Artifact
+[/card]
+[card]
 name=Unexpected Results
 auto=shuffle
 auto=reveal:1 optionone transforms((,newability[if type(land|reveal)~morethan~0 then moveto(ownerhand) && all(*[land]|reveal) moveto(ownerbattlefield)])) forever optiononeend optiontwo name(Put Back) target(<1>*[-land]|reveal) moveto(mylibrary) and!(transforms((,newability[may activate castcard(normal)])) oneshot)! optiontwoend revealend
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 3dd81a4bf..13b2f94ea 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -49760,7 +49760,7 @@ toughness=2
 [card]
 name=Hanweir the Writhing Township
 auto=meldfrom(Hanweir Battlements|Hanweir Garrison)
-auto=@combat(attacking) source(this):token(Eldrazi Horror)*2
+auto=@combat(attacking) source(this):token(Eldrazi Horror,Creature Eldrazi Horror,3/2,battleready)*2
 abilities=haste, trample
 text=Trample, haste -- Whenever Hanweir, the Writhing Township attacks, put two 3/2 colorless Eldrazi Horror creature tokens onto the battlefield tapped and attacking.
 type=Legendary Creature
@@ -66676,7 +66676,7 @@ type=Sorcery
 [/card]
 [card]
 name=Make Mischief
-auto=token(-410068)
+auto=token(Devil,Creature Devil,1/1,red) and!( transforms((,newability[@movedto(this|mygraveyard): damage:1 target(*[creature;player])])) forever )!
 target=creature,player
 auto=damage:1
 text=Make Mischief deals 1 damage to target creature or player. Put a 1/1 red Devil creature token onto the battlefield. It has "When this creature dies, it deals 1 damage to target creature or player."
@@ -104095,13 +104095,6 @@ mana={1}{B}
 type=Instant
 [/card]
 [card]
-name=Soul Separator
-auto={5}{t}{s}:target(creature|mygraveyard) transforms((,newability[moveto(exile)],newability[clone with(flying) addtype(spirit) set(p=1,t=1)])) forever
-text={5}, {T}, Sacrifice Soul Separator: Exile target creature card from your graveyard. Put a token onto the battlefield that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. Put a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal to that card's toughness.
-mana={3}
-type=Artifact
-[/card]
-[card]
 name=Soul Shepherd
 auto={W}{E(creature|mygraveyard)}:life:1
 text={W}, Exile a creature card from your graveyard: You gain 1 life.