diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index a3e6cecff..416a638c5 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -11208,7 +11208,7 @@ toughness=2
 [card]
 name=Blitz of the Thunder-Raptor
 target=creature,planeswalker
-auto=transforms((,newability[exiledeath])) ueot
+auto=exiledeath
 auto=damage:pginstantsorcery
 text=Blitz of the Thunder-Raptor deals damage to target creature or planeswalker equal to the number of instant and sorcery cards in your graveyard. If that creature or planeswalker would die this turn, exile it instead.
 mana={1}{R}
@@ -23709,9 +23709,9 @@ type=Sorcery
 [/card]
 [card]
 name=Cry of the Carnarium
-auto=all(creature|battlefield) -2/-2 ueot
 auto=all(creature[fresh]|graveyard) moveto(exile)
 auto=all(creature) exiledeath ueot
+auto=all(creature|battlefield) -2/-2 ueot
 text=All creatures get -2/-2 until end of turn. Exile all creature cards in all graveyards that were put there from the battlefield this turn. If a creature would die this turn, exile it instead.
 mana={1}{B}{B}
 type=Sorcery
@@ -27072,8 +27072,8 @@ type=Instant
 name=Demonfire
 target=anytarget
 auto=aslongas(*|myhand) shadow <1
+auto=exiledeath
 auto=damage:X
-auto=exiledeath ueot
 text=Demonfire deals X damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. -- Hellbent - If you have no cards in hand, Demonfire can't be countered and the damage can't be prevented.
 mana={X}{R}
 type=Sorcery
@@ -40536,7 +40536,7 @@ type=Instant
 [card]
 name=Flame-Blessed Bolt
 target=creature,planeswalker
-auto=exiledeath ueot
+auto=exiledeath
 auto=damage:2
 text=Flame-Blessed Bolt deals 2 damage to target creature or planeswalker. If that creature or planeswalker would die this turn, exile it instead.
 mana={R}
@@ -64895,8 +64895,8 @@ type=Sorcery
 [card]
 name=Lava Coil
 target=creature
-auto=damage:4
 auto=exiledeath
+auto=damage:4
 text=Lava Coil deals 4 damage to target creature. If that creature would die this turn, exile it instead.
 mana={1}{R}
 type=Sorcery
@@ -70121,6 +70121,21 @@ power=1
 toughness=2
 [/card]
 [card]
+name=Marisi, Breaker of the Coil
+auto=while(restriction{combatbeginsonly}) maxCast(*)0 opponent
+auto=while(restriction{attackersonly}) maxCast(*)0 opponent
+auto=while(restriction{blockersonly}) maxCast(*)0 opponent
+auto=while(restriction{combatdamageonly}) maxCast(*)0 opponent
+auto=while(restriction{combatendsonly}) maxCast(*)0 opponent
+auto=@combatdamagefoeof(player) from(creature|mybattlefield):all(creature|opponentBattlefield) _GOAD_
+text=Your opponents can't cast spells during combat. -- Whenever a creature you control deals combat damage to a player, goad each creature that player controls. (Until your next turn, those creatures attack each combat if able and attack a player other than you if able.)
+mana={1}{R}{G}{W}
+type=Legendary Creature
+subtype=Cat Warrior
+power=5
+toughness=4
+[/card]
+[card]
 name=Marit Lage's Slumber
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=_SCRY1_
@@ -76363,8 +76378,8 @@ type=Sorcery
 [card]
 name=Necrotic Wound
 target=creature
-auto=-type:creature:mygraveyard/-type:creature:mygraveyard ueot
 auto=exiledeath ueot
+auto=-type:creature:mygraveyard/-type:creature:mygraveyard ueot
 text=Undergrowth - Target creature gets -X/-X until end of turn, where X is the number of creature cards in your graveyard. If that creature would die this turn, exile it instead.
 mana={B}
 type=Instant
@@ -87195,7 +87210,7 @@ type=Enchantment
 [card]
 name=Puncturing Blow
 target=creature
-auto=teach(creature) exiledeath ueot
+auto=exiledeath
 auto=damage:5
 text=Puncturing Blow deals 5 damage to target creature. If that creature would die this turn, exile it instead.
 mana={2}{R}{R}
@@ -98234,8 +98249,8 @@ type=Sorcery
 [card]
 name=Scorching Dragonfire
 target=creature,planeswalker
+auto=exiledeath
 auto=damage:3
-auto=transforms((,newability[exiledeath])) ueot
 text=Scorching Dragonfire deals 3 damage to target creature or planeswalker. If that creature or planeswalker would die this turn, exile it instead.
 mana={1}{R}
 type=Instant
@@ -99222,6 +99237,14 @@ text=Secret Passage enters tapped. -- {T}: Add {U} or {B}. -- {4}, {T}: Investig
 type=Land
 [/card]
 [card]
+name=Secret Plans
+auto=lord(morph|myBattlefield) 0/1
+auto=@facedup(*|mybattlefield):draw:1
+text=Face-down creatures you control get +0/+1. -- Whenever a permanent you control is turned face up, draw a card.
+mana={G}{U}
+type=Enchantment
+[/card]
+[card]
 name=Secret Rendezvous
 auto=draw:3 controller
 auto=target(opponent) draw:3 targetedPlayer
@@ -107651,8 +107674,8 @@ name=Spikefield Hazard
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(Spikefield Cave)
 autohand={0}:restriction{can play land,compare(isflipped)~equalto~1} name(Spikefield Cave) name(Spikefield Cave) flip(Spikefield Cave) forcetype(land)
-auto=if type(creature|battlefield)~morethan~0 then choice name(Damage creature) name(Damage creature) target(creature) transforms((,newability[damage:1],newability[exiledeath])) ueot
-auto=if type(planeswalker|battlefield)~morethan~0 then choice name(Damage planeswalker) name(Damage planeswalker) target(planeswalker) transforms((,newability[damage:1],newability[exiledeath])) ueot
+auto=if type(creature|battlefield)~morethan~0 then choice name(Damage creature) name(Damage creature) target(creature) transforms((,newability[exiledeath],newability[damage:1])) ueot
+auto=if type(planeswalker|battlefield)~morethan~0 then choice name(Damage planeswalker) name(Damage planeswalker) target(planeswalker) transforms((,newability[exiledeath],newability[damage:1])) ueot
 auto=choice name(Damage player) name(Damage player) target(player) damage:1
 text=Spikefield Hazard deals 1 damage to any target. If a permanent dealt damage this way would die this turn, exile it instead. // Spikefield Cave
 mana={R}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 4e96ee08e..f22abbfd5 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -122826,8 +122826,8 @@ type=Enchantment
 [card]
 name=Touch of the Void
 target=anytarget
-auto=damage:3
 auto=exiledeath
+auto=damage:3
 text=Devoid (This card has no color.) -- Touch of the Void deals 3 damage to any target. If a creature dealt damage this way would die this turn, exile it instead.
 mana={2}{R}
 abilities=devoid
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index b8d75b3d5..0cf3d8138 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -987,7 +987,7 @@ name=Elspeth, Storm Slayer
 auto=counter(0/0,5,loyalty)
 auto=@tokencreated(*|myBattlefield):name(Double the token) all(trigger) clone options(notrigger)
 auto={C(0/0,+1,Loyalty)}:create(soldier:creature soldier:1/1:white)
-auto={C(0/0,0,Loyalty)}:all(creature|myBattlefield) counter(1/1) && flying uynt
+auto={C(0/0,0,Loyalty)}:all(creature|myBattlefield) transforms((,newability[counter(1/1)],flying)) uynt
 auto={C(0/0,-3,Loyalty)}:destroy target(creature[manacost>=3]|opponentBattlefield)
 text=If one or more tokens would be created under your control, twice that many of those tokens are created instead. -- [+1]: Create a 1/1 white Soldier creature token. -- [0]: Put a +1/+1 counter on each creature you control. Those creatures gain flying until your next turn. -- [-3]: Destroy target creature an opponent controls with mana value 3 or greater.
 mana={3}{W}{W}
@@ -3992,4 +3992,4 @@ text=+1: Creatures you control get +1/+0 and gain haste until end of turn. -- 0:
 mana={2}{R}{R}
 type=Legendary Planeswalker
 subtype=Zariel
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/build.number.properties b/projects/mtg/build.number.properties
index 85028db5b..939b3528c 100644
--- a/projects/mtg/build.number.properties
+++ b/projects/mtg/build.number.properties
@@ -2,5 +2,5 @@
 #Sun, 20 May 2020 11:56:35 +0200
 build.major=0
 build.minor=25
-build.point=3
+build.point=5
 
diff --git a/projects/mtg/include/Wagic_Version.h b/projects/mtg/include/Wagic_Version.h
index 7cdc44e64..cc8689552 100644
--- a/projects/mtg/include/Wagic_Version.h
+++ b/projects/mtg/include/Wagic_Version.h
@@ -14,7 +14,7 @@ Mod by: Vitty85
 /* Wagic versions */
 #define WAGIC_VERSION_MAJOR     0
 #define WAGIC_VERSION_MEDIUM    25
-#define WAGIC_VERSION_MINOR     3
+#define WAGIC_VERSION_MINOR     5
 
 #define VERSION_DOT(a, b, c) a ##.## b ##.## c
 #define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c