diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 5b46b1771..36af13330 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -25226,7 +25226,7 @@ toughness=2
 [card]
 name=Deathpact Angel
 abilities=flying
-auto=@movedTo(this|graveyard) from(battlefield):token(Cleric,Creature Cleric,1/1,white,black) && all(Cleric[token]|mybattlefield) transforms((,newability[{3}{W}{B}{B}{T}{S}:moveto(ownerbattlefield) notatarget(Deathpact Angel|mygraveyard)])) forever
+auto=@movedTo(this|graveyard) from(battlefield):token(Cleric,Creature Cleric,1/1,white,black) and!( transforms((,newability[{3}{W}{B}{B}{T}{S}:moveto(ownerbattlefield) notatarget(Deathpact Angel|mygraveyard)])) forever )!
 text=Flying -- When Deathpact Angel dies, put a 1/1 white and black Cleric creature token onto the battlefield. It has "{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield."
 mana={3}{W}{B}{B}
 type=Creature
@@ -41426,7 +41426,7 @@ toughness=2
 [card]
 name=Geist of Saint Traft
 abilities=opponentshroud
-auto=@combat(attacking) source(this):token(Angel Token,Creature Angel,4/4,white,flying,battleready) && all(Angel Token[attacking]|mybattlefield) phaseaction[combatends once] moveto(exile)
+auto=@combat(attacking) source(this):token(Angel Token,Creature Angel,4/4,white,flying,battleready) and!( transforms((,newability[phaseaction[combatends once] moveto(exile)])) forever )!
 text=Hexproof -- Whenever Geist of Saint Traft attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at the end of combat.
 mana={1}{W}{U}
 type=Legendary Creature
@@ -41536,7 +41536,7 @@ toughness=1
 [/card]
 [card]
 name=Gemini Engine
-auto=@combat(attacking) source(this):token(Twin,Gemini Creature,p/t,battleready) && all(Twin[gemini]|mybattlefield) phaseaction[combatends,sourceinplay] sacrifice
+auto=@combat(attacking) source(this):token(Twin,Gemini Creature,p/t,battleready) and!( transforms((,newability[phaseaction[combatends,sourceinplay] sacrifice])) forever )!
 text=Whenever Gemini Engine attacks, put a colorless Construct artifact creature token named Twin onto the battlefield attacking. Its power is equal to Gemini Engine's power and its toughness is equal to Gemini Engine's toughness. Sacrifice the token at end of combat.
 mana={6}
 type=Artifact Creature
@@ -54280,7 +54280,7 @@ toughness=1
 [card]
 name=Invocation of Saint Traft
 target=creature
-auto=@combat(attacking) source(mytgt):token(Saint Traft Angel,Creature Angel,4/4,white,flying,battleready) && all(Saint Traft Angel[attacking]|mybattlefield) phaseaction[combatends once] moveto(exile)
+auto=@combat(attacking) source(mytgt):token(Angel,Creature Angel,4/4,white,flying,battleready) and!( transforms((,newability[phaseaction[combatends once] moveto(exile)])) forever )!
 text=Enchant creature -- Enchanted creature has "Whenever this creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat."
 mana={1}{W}{U}
 type=Enchantment
@@ -94611,7 +94611,7 @@ toughness=2
 [card]
 name=Sengir Nosferatu
 abilities=flying
-auto={1}{B}{E}:token(Bat Token,Creature Bat,1/2,flying,black) && all(Bat Token) transforms((,newability[{1}{B}{S}:moverandom(Sengir Nosferatu) from(exile) to(mybattlefield)])) forever
+auto={1}{B}{E}:token(Bat,Creature Bat,1/2,flying,black) and!( transforms((,newability[{1}{B}{S}:notatarget(Sengir Nosferatu|exile) moveto(mybattlefield)])) forever )!
 text=Flying -- {1}{B}, Exile Sengir Nosferatu: Put a 1/2 black Bat creature token with flying onto the battlefield. It has "{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control."
 mana={3}{B}{B}
 type=Creature