diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 323b940c5..24832d9a9 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -10611,15 +10611,6 @@ type=Sorcery
 subtype=Arcane
 [/card]
 [card]
-name=Hellfire Mongrel
-text=At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, Hellfire Mongrel deals 2 damage to him or her.
-mana={2}{R}
-type=Creature
-subtype=Elemental Hound
-power=2
-toughness=2
-[/card]
-[card]
 name=Hellhole Rats
 text=Haste -- When Hellhole Rats enters the battlefield, target player discards a card. Hellhole Rats deals damage to that player equal to that card's converted mana cost.
 mana={2}{B}{R}
@@ -11878,15 +11869,6 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
-name=Iona, Shield of Emeria
-text=Flying -- As Iona, Shield of Emeria enters the battlefield, choose a color. -- Your opponents can't cast spells of the chosen color.
-mana={6}{W}{W}{W}
-type=Legendary Creature
-subtype=Angel
-power=7
-toughness=7
-[/card]
-[card]
 name=Ironclaw Curse
 text=Enchant creature -- Enchanted creature gets -0/-1. -- Enchanted creature can't block creatures with power equal to or greater than the enchanted creature's toughness.
 mana={R}
@@ -13705,15 +13687,6 @@ power=8
 toughness=5
 [/card]
 [card]
-name=Living Tsunami
-text=Flying -- At the beginning of your upkeep, sacrifice Living Tsunami unless you return a land you control to its owner's hand.
-mana={2}{U}{U}
-type=Creature
-subtype=Elemental
-power=4
-toughness=4
-[/card]
-[card]
 name=Living Wish
 text=You may choose a creature or land card you own from outside the game, reveal that card, and put it into your hand. Exile Living Wish.
 mana={1}{G}
@@ -19270,12 +19243,6 @@ mana={3}{R}
 type=Sorcery
 [/card]
 [card]
-name=Quest for Ancient Secrets
-text=Whenever a card is put into your graveyard from anywhere, you may put a quest counter on Quest for Ancient Secrets. -- Remove five quest counters from Quest for Ancient Secrets and sacrifice it: Target player shuffles his or her graveyard into his or her library.
-mana={U}
-type=Enchantment
-[/card]
-[card]
 name=Quest for Pure Flame
 text=Whenever a source you control deals damage to an opponent, you may put a quest counter on Quest for Pure Flame. -- Remove four quest counters from Quest for Pure Flame and sacrifice it: If any source you control would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
 mana={R}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index e81310f05..e40d63875 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -28744,6 +28744,16 @@ mana={2}{B}{B}{B}
 type=Sorcery
 [/card]
 [card]
+name=Hellfire Mongrel
+auto=@each opponent upkeep:aslongas(*|opponenthand) damage:2 opponent <3
+text=At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, Hellfire Mongrel deals 2 damage to him or her.
+mana={2}{R}
+type=Creature
+subtype=Elemental Hound
+power=2
+toughness=2
+[/card]
+[card]
 name=Hellkite Hatchling
 auto=counter(0/0,-1,devour) all(other creature)
 auto=counter(0/0,1,devour)
@@ -31308,6 +31318,26 @@ mana={X}{U}{U}{R}
 type=Sorcery
 [/card]
 [card]
+name=Iona, Shield of Emeria
+abilities=flying
+auto=choice name(white) && counter(0/0,1,White) all(this)
+auto=choice name(blue) && counter(0/0,1,Blue) all(this)
+auto=choice name(black) && counter(0/0,1,Black) all(this)
+auto=choice name(red) && counter(0/0,1,Red) all(this)
+auto=choice name(green) && counter(0/0,1,Green) all(this)
+auto=this(counter{0/0.1.White}) cantcast(*[white]) opponent
+auto=this(counter{0/0.1.Blue}) cantcast(*[blue]) opponent
+auto=this(counter{0/0.1.Black}) cantcast(*[black]) opponent
+auto=this(counter{0/0.1.Red}) cantcast(*[red]) opponent
+auto=this(counter{0/0.1.Green}) cantcast(*[green]) opponent
+text=Flying -- As Iona, Shield of Emeria enters the battlefield, choose a color. -- Your opponents can't cast spells of the chosen color.
+mana={6}{W}{W}{W}
+type=Legendary Creature
+subtype=Angel
+power=7
+toughness=7
+[/card]
+[card]
 name=Iona's Judgment
 target=creature,enchantment
 auto=moveTo(exile)
@@ -36501,6 +36531,17 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Living Tsunami
+abilities=flying
+auto=upcost[{H(land|mybattlefield)}] sacrifice
+text=Flying -- At the beginning of your upkeep, sacrifice Living Tsunami unless you return a land you control to its owner's hand.
+mana={2}{U}{U}
+type=Creature
+subtype=Elemental
+power=4
+toughness=4
+[/card]
+[card]
 name=Living Wall
 abilities=defender
 auto={1}:regenerate
@@ -48350,7 +48391,15 @@ text=Counter target instant or sorcery spell. Search its controller's graveyard,
 mana={2}{U}{U}
 type=Instant
 [/card]
-
+[card]
+name=Quest for Ancient Secrets
+auto=@movedTo(*|mygraveyard):may counter(0/0,1,Quest) all(this)
+auto={C(0/0,-5,Quest)}{S}:name(shuffle your graveyard into your library) && moveto(myLibrary) all(*|myGraveyard) && shuffle
+auto={C(0/0,-5,Quest)}{S}:name(shuffle your graveyard into your library) && moveto(opponentLibrary) all(*|opponentGraveyard) && shuffle
+text=Whenever a card is put into your graveyard from anywhere, you may put a quest counter on Quest for Ancient Secrets. -- Remove five quest counters from Quest for Ancient Secrets and sacrifice it: Target player shuffles his or her graveyard into his or her library.
+mana={U}
+type=Enchantment
+[/card]
 [card]
 name=Quest for the Gemblades
 auto=@combatdamaged(creature) from(creature|myBattlefield):may counter(0/0,1,Quest) all(this)