diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 227e350ef..6fdbde9ce 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -8939,16 +8939,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Goatnapper
-auto=target(Goat) moveto(mybattlefield) && transforms((,haste)) && phaseaction[endofturn] moveto(ownerbattlefield)
-text=When Goatnapper enters the battlefield, untap target Goat and gain control of it until end of turn. It gains haste until end of turn.
-mana={2}{R}
-type=Creature
-subtype=Goblin Rogue
-power=2
-toughness=2
-[/card]
-[card]
 name=Goblin Archaeologist
 text={R}, {T}: Flip a coin. If you win the flip, destroy target artifact and untap Goblin Archaeologist. If you lose the flip, sacrifice Goblin Archaeologist.
 mana={1}{R}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index d546c2142..f7dd26197 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -10784,6 +10784,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Goatnapper
+auto=choice target(goat) moveto(mybattlefield) && transforms((,haste,newability[untap],newability[phaseaction[endofturn] moveto(ownerbattlefield)])) ueot
+text=When Goatnapper enters the battlefield, untap target Goat and gain control of it until end of turn. It gains haste until end of turn.
+mana={2}{R}
+type=Creature
+subtype=Goblin Rogue
+power=2
+toughness=2
+[/card]
+[card]
 name=Gobhobbler Rats
 mana={B}{R}
 text=Hellbent -- As long as you have no cards in hand, Gobhobbler Rats gets +1/+0 and has "{B}: Regenerate Gobhobbler Rats."