diff --git a/projects/mtg/Windows/Wagic.ico b/projects/mtg/Windows/Wagic.ico
index 46e547353..417180a8c 100644
Binary files a/projects/mtg/Windows/Wagic.ico and b/projects/mtg/Windows/Wagic.ico differ
diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
index 36f6d632f..abe01740c 100644
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -54,6 +54,12 @@
 # Enrage
 #AUTO_DEFINE _ENRAGE_ @damaged(this):
 
+# Whenever you draw your second card each turn
+#AUTO_DEFINE _SECOND_DRAW_ @drawof(player) restriction{compare(pdrewcount)~equalto~2}:
+
+# Batallion
+#AUTO_DEFINE _BATALLION_ @combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:
+
 # Champion
 #AUTO_DEFINE _CHAMPION_($Word) aslongas(other $word|myBattlefield) choice notAtarget(other $word|myBattlefield) (blink)forsrc oneshot
 
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 79f7a79d6..03a7f0d89 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -6528,7 +6528,8 @@ subtype=Equipment
 [/card]
 [card]
 name=Bloodhaze Wolverine
-auto=@drawof(player):transforms((,newability[@drawof(player) restriction{once}:1/1 && first strike])) ueot
+auto=_SECOND_DRAW_1/1 ueot
+auto=_SECOND_DRAW_first strike ueot
 text=Whenever you draw your second card each turn, Bloodhaze Wolverine gets +1/+1 and gains first strike until end of turn.
 mana={1}{R}
 type=Creature
@@ -20673,7 +20674,7 @@ toughness=1
 [card]
 name=Faerie Vandal
 abilities=flash,flying
-auto=@drawof(player):transforms((,newability[@drawof(player) restriction{once}:counter(1/1,1)])) ueot
+auto=_SECOND_DRAW_counter(1/1)
 text=Flash -- Flying -- Whenever you draw your second card each turn, put a +1/+1 counter on Faerie Vandal.
 mana={1}{U}
 type=Creature
@@ -27799,7 +27800,7 @@ toughness=3
 [/card]
 [card]
 name=Haazda Marshal
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:create(soldier:creature soldier:1/1:white:lifelink)
+auto=_BATALLION_create(soldier:creature soldier:1/1:white:lifelink)
 text=Whenever Haazda Marshal and at least two other creatures attack, create a 1/1 white Soldier creature token with lifelink.
 mana={W}
 type=Creature
@@ -31203,7 +31204,7 @@ subtype=Aura
 [/card]
 [card]
 name=Improbable Alliance
-auto=@drawof(player):transforms((,newability[@drawof(player) restriction{once}:create(Faerie:creature Faerie:1/1:blue:flying)])) ueot
+auto=_SECOND_DRAW_create(Faerie:creature Faerie:1/1:blue:flying)
 auto={4}{U}{R}:draw:1 && transforms((,newability[target(*|myhand) reject])) forever
 text=Whenever you draw your second card each turn, create a 1/1 blue Faerie creature token with flying. -- {4}{U}{R}: Draw a card, then discard a card.
 mana={U}{R}
@@ -32350,7 +32351,7 @@ type=Sorcery
 [/card]
 [card]
 name=Irencrag Pyromancer
-auto=@drawof(player):transforms((,newability[@drawof(player) once:damage:3 target(player,creature,planeswalker)])) ueot
+auto=_SECOND_DRAW_damage:3 target(player;creature;planeswalker)
 text=Whenever you draw your second card each turn, Irencrag Pyromancer deals 3 damage to any target.
 mana={2}{R}
 type=Creature
@@ -33111,7 +33112,7 @@ type=Instant
 [/card]
 [card]
 name=Jolrael, Mwonvuli Recluse
-auto=@drawof(player) restriction{compare(pdrewcount)~equalto~2}:name(Create cat) token(Cat Jol)
+auto=_SECOND_DRAW_name(Create cat) token(Cat Jol)
 auto={4}{G}{G}:name(All creatures becomes X/X) all(creature|mybattlefield) transforms((,setpower=type:*:myHand,settoughness=type:*:myHand)) ueot
 text=Whenever you draw your second card each turn, create a 2/2 green Cat creature token. -- {4}{G}{G}: Until end of turn, creatures you control have base power and toughness X/X, where X is the number of cards in your hand.
 mana={1}{G}
@@ -35562,7 +35563,7 @@ type=Artifact
 [card]
 name=Kytheon, Hero of Akros
 auto=@movedto(Moonmist|stack):name(Transform Human Soldier) moveto(ownerBattlefield) && flip(Gideon, Battle-Forged)
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:moveto(exile) and!( moveto(mybattlefield) and!(counter(0/0,3,Loyalty) && flip(Gideon, Battle-Forged)
+auto=_BATALLION_moveto(exile) and!( moveto(mybattlefield) and!(counter(0/0,3,Loyalty) && flip(Gideon, Battle-Forged)
 auto={2}{W}:all(this) indestructible ueot
 text=At end of combat, if Kytheon, Hero of Akros and at least two other creatures attacked this combat, exile Kytheon, then return him to the battlefield transformed under his owner's control. -- {2}{W}: Kytheon gains indestructible until end of turn.
 mana={W}
@@ -38023,7 +38024,7 @@ toughness=2
 [/card]
 [card]
 name=Mad Ratter
-auto=@drawof(player):transforms((,newability[@drawof(player) restriction{once}:create(Rat:creature Rat:1/1:black)])) ueot
+auto=_SECOND_DRAW_create(Rat:creature Rat:1/1:black)*2
 text=Whenever you draw your second card each turn, create two 1/1 black Rat creature tokens.
 mana={3}{R}
 type=Creature
@@ -38348,7 +38349,7 @@ type=Instant
 [/card]
 [card]
 name=Makeshift Battalion
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:counter(1/1)
+auto=_BATALLION_counter(1/1)
 text=Whenever Makeshift Battalion and at least two other creatures attack, put a +1/+1 counter on Makeshift Battalion.
 mana={2}{W}
 type=Creature
@@ -38653,7 +38654,7 @@ toughness=4
 name=Mantle of Tides
 auto={3}:equip
 auto=teach(creature) 1/2
-auto=@drawof(player):transforms((,newability[@drawof(player) restriction{once}:equip target(creature|mybattlefield)
+auto=_SECOND_DRAW_rehook target(creature|mybattlefield)
 text=Equipped creature gets +1/+2. -- Whenever you draw your second card each turn, attach Mantle of Tides to target creature you control. -- Equip {3} ({3} : Attach to target creature you control. Equip only as a sorcery.)
 mana={U}
 type=Artifact
@@ -40091,7 +40092,7 @@ toughness=1
 [/card]
 [card]
 name=Minn, Wily Illusionist
-auto=@drawof(player) restriction{compare(pdrewcount)~equalto~2}:token(Illusion,Creature Illusion,1/1,blue) and!( transforms((,newability[foreach(other *[illusion]|mybattlefield) 1/0])) forever )!
+auto=_SECOND_DRAW_token(Illusion,Creature Illusion,1/1,blue) and!( transforms((,newability[foreach(other *[illusion]|mybattlefield) 1/0])) forever )!
 auto=@movedTo(illusion[power=0]|graveyard) from(mybattlefield):may name(Put permanent on battlefield) target(*[-instant;-sorcery;manacost<=0]|myhand) moveto(mybattlefield)
 auto=@movedTo(illusion[power=1]|graveyard) from(mybattlefield):may name(Put permanent on battlefield) target(*[-instant;-sorcery;manacost<=1]|myhand) moveto(mybattlefield)
 auto=@movedTo(illusion[power=2]|graveyard) from(mybattlefield):may name(Put permanent on battlefield) target(*[-instant;-sorcery;manacost<=2]|myhand) moveto(mybattlefield)
@@ -41347,7 +41348,7 @@ subtype=Island
 [/card]
 [card]
 name=Mystic Skyfish
-auto=@drawof(player):transforms((,newability[@drawof(player) restriction{once}:flying])) ueot
+auto=_SECOND_DRAW_flying ueot
 text=Whenever you draw your second card each turn, Mystic Skyfish gains flying until end of turn.
 mana={2}{U}
 type=Creature
@@ -60643,7 +60644,7 @@ toughness=4
 [card]
 name=Steelgaze Griffin
 abilities=flying
-auto=@drawof(player):transforms((,newability[@drawof(player) restriction{once}:2/0])) ueot
+auto=_SECOND_DRAW_2/0 ueot
 text=Flying -- Whenever you draw your second card each turn, Steelgaze Griffin gets +2/+0 until end of turn.
 mana={4}{U}
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index c5a92fb50..89fc30456 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -13466,7 +13466,7 @@ toughness=1
 [/card]
 [card]
 name=Bomber Corps
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:damage:1 target(creature,player)
+auto=_BATALLION_damage:1 target(creature,player)
 text=Battalion -- Whenever Bomber Corps and at least two other creatures attack, Bomber Corps deals 1 damage to target creature or player.
 mana={1}{R}
 type=Creature
@@ -13885,7 +13885,7 @@ type=Artifact
 [/card]
 [card]
 name=Boros Elite
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:2/2 ueot
+auto=_BATALLION_2/2 ueot
 text=Battalion -- Whenever Boros Elite and at least two other creatures attack, Boros Elite gets +2/+2 until end of turn.
 mana={W}
 type=Creature
@@ -13941,7 +13941,7 @@ type=Artifact
 [/card]
 [card]
 name=Boros Mastiff
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:lifelink ueot
+auto=_BATALLION_lifelink ueot
 text=Battalion -- Whenever Boros Mastiff and at least two other creatures attack, Boros Mastiff gets lifelink until end of turn.
 mana={1}{W}
 type=Creature
@@ -25644,7 +25644,7 @@ type=Instant
 [/card]
 [card]
 name=Daring Skyjek
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:flying ueot
+auto=_BATALLION_flying ueot
 text=Battalion -- Whenever Daring Skyjek and at least two other creatures attack, Daring Skyjek gains flying until end of turn.
 mana={1}{W}
 type=Creature
@@ -40721,7 +40721,7 @@ toughness=2
 [/card]
 [card]
 name=Firefist Striker
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:cantblock target(creature) ueot
+auto=_BATALLION_cantblock target(creature) ueot
 text=Battalion -- Whenever Firefist Striker and at least two other creatures attack, target creature can't block this turn.
 mana={1}{R}
 type=Creature
@@ -40803,7 +40803,7 @@ toughness=3
 [card]
 name=Firemane Avenger
 abilities=flying
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:choice damage:3 target(creature,player) && life:3 controller
+auto=_BATALLION_choice damage:3 target(creature,player) && life:3 controller
 text=Flying -- Battalion -- Whenever Firemane Avenger and at least two other creatures attack, Firemane Avenger deals 3 damage to target creature or player and you gain 3 life.
 mana={2}{R}{W}
 type=Creature
@@ -66275,7 +66275,7 @@ type=Enchantment
 [card]
 name=Legion Loyalist
 abilities=haste
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:all(creature|mybattlefield) transforms((,first strike,trample,newability[cantbeblockedby(creature[token])])) ueot
+auto=_BATALLION_all(creature|mybattlefield) transforms((,first strike,trample,newability[cantbeblockedby(creature[token])])) ueot
 text=Haste -- Battalion -- Whenever Legion Loyalist and at least two other creatures attack, creatures you control gain first strike and trample until end of turn and can't be blocked by creature tokens this turn.
 mana={R}
 type=Creature
@@ -78441,7 +78441,7 @@ type=Sorcery
 [/card]
 [card]
 name=Nav Squad Commandos
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:1/1 ueot && untap
+auto=_BATALLION_1/1 ueot && untap
 text=Battalion -- Whenever Nav Squad Commandos and at least two other creatures attack, Nav Squad Commandos gets +1/+1 until end of turn. Untap it.
 mana={4}{W}
 type=Creature
@@ -83004,7 +83004,7 @@ toughness=1
 [/card]
 [card]
 name=Ordruun Veteran
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:double strike ueot
+auto=_BATALLION_double strike ueot
 text=Battalion -- Whenever Ordruun Veteran and at least two other creatures attack, Ordruun Veteran gains double strike until end of turn. (It deals both first-strike and regular combat damage.)
 mana={2}{R}{W}
 type=Creature
@@ -117266,7 +117266,7 @@ type=Land
 [card]
 name=Tajic, Blade of the Legion
 abilities=indestructible
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:5/5 ueot
+auto=_BATALLION_5/5 ueot
 text=Battalion -- Whenever Tajic atttacks with at least two other creatures attack, Tajic gets +5/+5 until end of turn. 
 mana={2}{R}{W}
 type=Legendary Creature
@@ -119427,7 +119427,7 @@ toughness=1
 [/card]
 [card]
 name=Thalakos Dreamsower
-abilities=doesnotuntap
+abilities=shadow,doesnotuntap
 auto=@each my untap sourcetap:may untap
 auto=@damagefoeof(player) from(this):target(creature) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
 text=Shadow (This creature can block or be blocked by only creatures with shadow.) -- You may choose not to untap Thalakos Dreamsower during your untap step. -- Whenever Thalakos Dreamsower deals damage to an opponent, tap target creature. That creature doesn't untap during its controller's untap step for as long as Thalakos Dreamsower remains tapped.
@@ -131931,7 +131931,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Warmind Infantry
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:2/0 ueot
+auto=_BATALLION_2/0 ueot
 text=Battalion -- Whenever Warmind Infantry and at least two other creatures attack, Warmind Infantry gets +2/+0 until end of turn.
 mana={2}{R}
 type=Creature
@@ -135111,7 +135111,7 @@ toughness=5
 [/card]
 [card]
 name=Wojek Halberdiers
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:first strike ueot
+auto=_BATALLION_first strike ueot
 text=Battalion -- Whenever Wojek Halberdiers and at least two other creatures attack, Wojek Halberdiers gains first strike until end of turn.
 mana={R}{W}
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index 58074faff..9cea99be2 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -1169,7 +1169,7 @@ subtype=Inzerva
 [card]
 name=Jace, Arcane Strategist
 auto=counter(0/0,4,loyalty)
-auto=@drawof(player):transforms((,newability[@drawof(player) restriction{once}:counter(1/1,1) target(creature|myBattlefield)])) ueot
+auto=_SECOND_DRAW_counter(1/1) target(creature|myBattlefield)
 auto={C(0/0,1,Loyalty)}:name(+1: Draw a card) draw:1 controller
 auto={C(0/0,-7,Loyalty)}:name(-7: Creatures you control can't be blocked) all(creature|myBattlefield) unblockable
 text=Whenever you draw your second card each turn, put a +1/+1 counter on target creature you control. -- +1: Draw a card. -- -7: Creatures you control can't be blocked this turn.