diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index e79cc357b..64ac97878 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -2572,11 +2572,6 @@ mana={1}{WB}
 type=Instant
 [/card]
 [card]
-name=Bazaar of Baghdad
-text={T}: Draw two cards, then discard three cards.
-type=Land
-[/card]
-[card]
 name=Bazaar of Wonders
 text=When Bazaar of Wonders enters the battlefield, exile all cards from all graveyards. -- Whenever a player casts a spell, counter it if a card with the same name is in a graveyard or a nontoken permanent with the same name is on the battlefield.
 mana={3}{U}{U}
@@ -20755,15 +20750,6 @@ power=5
 toughness=5
 [/card]
 [card]
-name=Magus of the Bazaar
-text={T}: Draw two cards, then discard three cards.
-mana={1}{U}
-type=Creature
-subtype=Human Wizard
-power=0
-toughness=1
-[/card]
-[card]
 name=Magus of the Candelabra
 text={X}, {T}: Untap X target lands.
 mana={G}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 7bf9ed33b..6b4c4fab8 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -3699,6 +3699,20 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Bazaar of Baghdad
+auto={T}:token(-20122011)*3 && draw:2
+text={T}: Draw 2 cards, then discard 3 cards.
+type=Land
+[/card]
+[card]
+name=Bazaar of Baghdad Discard
+auto=counter(0/0,1,Bazaar of Baghdad)
+auto=@movedTo(*|myhand) from(mylibrary):thisforeach(counter{0/0.1.Bazaar of Baghdad}>0) moveTo(mygraveyard) target(*|myhand) && counter(0/0,-1,Bazaar of Baghdad) && counter(0/0,1,Bury)
+auto=thisforeach(counter{0/0.1.Bury}>0) bury
+type=Nothing
+id=-20122011
+[/card]
+[card]
 name=Bazaar Trader
 auto={T}:moveTo(opponentBattlefield) target(artifact,creature,land|myBattlefield)
 text={T}: Target player gains control of target artifact, creature, or land you control.
@@ -27070,6 +27084,24 @@ power=*
 toughness=*
 [/card]
 [card]
+name=Magus of the Bazaar
+auto={T}:token(-13100811)*3 && draw:2
+text={T}: Draw two cards, then discard three cards.
+mana={1}{U}
+type=Creature
+subtype=Human Wizard
+power=0
+toughness=1
+[/card]
+[card]
+name=Magus of the Bazaar Discard
+auto=counter(0/0,1,Magus of Bazaar)
+auto=@movedTo(*|myhand) from(mylibrary):thisforeach(counter{0/0.1.Magus of Bazaar}>0) moveTo(mygraveyard) target(*|myhand) && counter(0/0,-1,Magus of Bazaar) && counter(0/0,1,Bury)
+auto=thisforeach(counter{0/0.1.Bury}>0) bury
+type=Nothing
+id=-13100811
+[/card]
+[card]
 name=Magus of the Coffers
 auto={2}{T}:foreach(swamp|myBattlefield) Add:{B}
 text={2}, {T}: Add {B} to your mana pool for each Swamp you control.