diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 496337284..f6b1bb89c 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -13,7 +13,7 @@ type=Instant
 text=Target creature gets +1/+1 until end of turn.   Draw a card.
 target=creature
 auto=1/1
-auto=draw:1
+auto=draw:1 controller
 id=24127
 name=Aggressive Urge
 rarity=C
@@ -57,7 +57,7 @@ type=Enchantment
 text=Destroy target nonblack creature. It can't be regenerated.   Draw a card.
 target=creature[-black]
 auto=bury
-auto=draw:1
+auto=draw:1 controller
 id=23042
 name=Annihilate
 rarity=U
@@ -333,7 +333,7 @@ mana={3}{R}
 text=Remove target card in a graveyard from the game. Draw a card.
 target=*|graveyard
 auto=moveto(removedfromgame)
-auto=draw:1
+auto=draw:1 control
 id=24119
 name=Cremate
 rarity=U
@@ -439,7 +439,7 @@ type=Artifact
 text=Sacrifice a creature or land.   Draw a card.
 target=creature,land|mybattlefield
 auto=bury
-auto=draw:1
+auto=draw:1 controller
 id=24124
 name=Dredge
 rarity=U
@@ -512,7 +512,7 @@ abilities=legendary
 text=Counter target creature spell.   Draw a card.
 target=creature|stack
 auto=fizzle
-auto=draw:1
+auto=draw:1 controller
 id=22986
 name=Exclude
 rarity=C
@@ -788,7 +788,7 @@ abilities=cantblock
 text=When Kavu Climber enters the battlefield, draw a card.
 id=23109
 name=Kavu Climber
-auto=draw:1
+auto=draw:1 controller
 rarity=C
 mana={3}{G}{G}
 type=Creature
@@ -1321,7 +1321,7 @@ type=Enchantment
 text=Return target creature card from your graveyard to your hand.   Draw a card.
 target=creature|myGraveyard
 auto=moveTo(myhand)
-auto=draw:1
+auto=draw:1 controller
 id=23029
 name=Recover
 rarity=C
@@ -1334,7 +1334,7 @@ target=creature
 auto=moveTo(ownerhand)
 id=22985
 name=Repulse
-auto=draw:1
+auto=draw:1 controller
 rarity=C
 mana={2}{U}
 type=Instant
@@ -1343,7 +1343,7 @@ type=Instant
 text=You gain 3 life.   Draw a card.
 id=22941
 auto=life:3
-auto=draw:1
+auto=draw:1 controller
 name=Reviving Dose
 rarity=C
 mana={2}{W}
@@ -1364,7 +1364,7 @@ abilities=legendary,flying
 [/card]
 [card]
 text=Vigilance   When Riptide Crab is put into a graveyard from the battlefield, draw a card.
-auto=@movedTo(this|graveyard):draw:1
+auto=@movedTo(this|graveyard):draw:1 controller
 id=23150
 name=Riptide Crab
 rarity=U
@@ -1437,7 +1437,7 @@ abilities=cantattack
 text=Enchant creature   When Scavenged Weaponry enters the battlefield, draw a card.   Enchanted creature gets +1/+1.
 target=creature
 auto=1/1
-auto=draw:1
+auto=draw:1 controller
 id=23028
 name=Scavenged Weaponry
 rarity=C
@@ -1667,7 +1667,7 @@ id=23073
 name=Stun
 target=creature
 auto=cantattack
-auto=draw:1
+auto=draw:1 controller
 rarity=C
 mana={1}{R}
 type=Instant