diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 984965ef6..ce33ecd90 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -57,12 +57,6 @@ mana={2}{U}
 type=Instant
 [/card]
 [card]
-name=AEther Vial
-text=At the beginning of your upkeep, you may put a charge counter on AEther Vial. -- {T}: You may put a creature card with converted mana cost equal to the number of charge counters on AEther Vial from your hand onto the battlefield.
-mana={1}
-type=Artifact
-[/card]
-[card]
 name=AEthermage's Touch
 text=Reveal the top four cards of your library. You may put a creature card from among them onto the battlefield. It has "At the beginning of your end step, return this creature to its owner's hand." Then put the rest of the cards revealed this way on the bottom of your library in any order.
 mana={2}{W}{U}
@@ -367,16 +361,6 @@ power=4
 toughness=3
 [/card]
 [card]
-name=Aerie Ouphes
-abilities=persist
-text=Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying. -- Persist (When this creature is put into a graveyard from the battlefield, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
-mana={4}{G}
-type=Creature
-subtype=Ouphe
-power=3
-toughness=3
-[/card]
-[card]
 name=Afiya Grove
 text=Afiya Grove enters the battlefield with three +1/+1 counters on it. -- At the beginning of your upkeep, move a +1/+1 counter from Afiya Grove onto target creature. -- When Afiya Grove has no +1/+1 counters on it, sacrifice it.
 mana={1}{G}
@@ -2550,12 +2534,6 @@ mana={2}{W}{W}
 type=Sorcery
 [/card]
 [card]
-name=Battle of Wits
-text=At the beginning of your upkeep, if you have 200 or more cards in your library, you win the game.
-mana={3}{U}{U}
-type=Enchantment
-[/card]
-[card]
 name=Battlefield Medic
 text={T}: Prevent the next X damage that would be dealt to target creature this turn, where X is the number of Clerics on the battlefield.
 mana={1}{W}
@@ -4816,12 +4794,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Catalog
-text=Draw two cards, then discard a card.
-mana={2}{U}
-type=Instant
-[/card]
-[card]
 name=Catalyst Stone
 text=Flashback costs you pay cost up to {2} less. -- Flashback costs your opponents pay cost {2} more.
 mana={2}
@@ -5972,12 +5944,6 @@ mana={3}
 type=Artifact
 [/card]
 [card]
-name=Coalition Victory
-text=You win the game if you control a land of each basic land type and a creature of each color.
-mana={3}{W}{U}{B}{R}{G}
-type=Sorcery
-[/card]
-[card]
 name=Coat of Arms
 text=Each creature gets +1/+1 for each other creature on the battlefield that shares at least one creature type with it. (For example, if two Goblin Warriors and a Goblin Shaman are on the battlefield, each gets +2/+2.)
 mana={5}
@@ -6855,17 +6821,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Crovax the Cursed
-auto=counter(1/1,4)
-auto=may
-text=Crovax the Cursed enters the battlefield with four +1/+1 counters on it. -- At the beginning of your upkeep, you may sacrifice a creature. If you do, put a +1/+1 counter on Crovax. If you don't, remove a +1/+1 counter from Crovax. -- {B}: Crovax gains flying until end of turn.
-mana={2}{B}{B}
-type=Legendary Creature
-subtype=Vampire
-power=0
-toughness=0
-[/card]
-[card]
 name=Crown of Ascension
 text=Enchant creature -- Enchanted creature has flying. -- Sacrifice Crown of Ascension: Enchanted creature and other creatures that share a creature type with it gain flying until end of turn.
 mana={1}{U}
@@ -7492,12 +7447,6 @@ mana={2}
 type=Artifact
 [/card]
 [card]
-name=Darksteel Reactor
-text=Darksteel Reactor is indestructible. ("Destroy" effects and lethal damage don't destroy it.) -- At the beginning of your upkeep, you may put a charge counter on Darksteel Reactor. -- When Darksteel Reactor has twenty or more charge counters on it, you win the game.
-mana={4}
-type=Artifact
-[/card]
-[card]
 name=Daru Healer
 text={T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. -- Morph {W} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
 mana={2}{W}
@@ -8910,12 +8859,6 @@ mana={4}
 type=Artifact
 [/card]
 [card]
-name=Door to Nothingness
-text=Door to Nothingness enters the battlefield tapped. -- {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}, {T}, Sacrifice Door to Nothingness: Target player loses the game.
-mana={5}
-type=Artifact
-[/card]
-[card]
 name=Doran, the Siege Tower
 text=Each creature assigns combat damage equal to its toughness rather than its power.
 mana={B}{G}{W}
@@ -10526,12 +10469,6 @@ mana={5}
 type=Artifact
 [/card]
 [card]
-name=Epic Struggle
-text=At the beginning of your upkeep, if you control twenty or more creatures, you win the game.
-mana={2}{G}{G}
-type=Enchantment
-[/card]
-[card]
 name=Epicenter
 text=Target player sacrifices a land. -- Threshold - All players sacrifice all lands instead if seven or more cards are in your graveyard.
 mana={4}{R}
@@ -18158,7 +18095,6 @@ toughness=1
 [/card]
 [card]
 name=Juniper Order Advocate
-auto=aslongas(this[-tapped]) lord(creature[green]|myinplay)1/1 #Aslongas does work with "this" keyword
 text=Green creatures you control get +1/+1 as long as Juniper Order Advocate is untapped.
 mana={2}{W}
 type=Creature
@@ -18167,15 +18103,6 @@ power=1
 toughness=2
 [/card]
 [card]
-name=Junk Golem
-text=Junk Golem enters the battlefield with three +1/+1 counters on it. -- At the beginning of your upkeep, sacrifice Junk Golem unless you remove a +1/+1 counter from it. -- {1}, Discard a card: Put a +1/+1 counter on Junk Golem.
-mana={4}
-type=Artifact Creature
-subtype=Golem
-power=0
-toughness=0
-[/card]
-[card]
 name=Junktroller
 text=Defender (This creature can't attack.) -- {T}: Put target card in a graveyard on the bottom of its owner's library.
 mana={4}
@@ -19890,14 +19817,6 @@ power=4
 toughness=2
 [/card]
 [card]
-name=Legacy Weapon
-auto={W}{U}{B}{R}{G}:moveto(exile) target(*)
-#as the same ability as darksteel collosus
-text={W}{U}{B}{R}{G}: Exile target permanent. -- If Legacy Weapon would be put into a graveyard from anywhere, reveal Legacy Weapon and shuffle it into its owner's library instead.
-mana={7}
-type=Legendary Artifact
-[/card]
-[card]
 name=Legacy's Allure
 text=At the beginning of your upkeep, you may put a treasure counter on Legacy's Allure. -- Sacrifice Legacy's Allure: Gain control of target creature with power less than or equal to the number of treasure counters on Legacy's Allure. (This effect lasts indefinitely.)
 mana={U}{U}
@@ -21763,12 +21682,6 @@ power=2
 toughness=3
 [/card]
 [card]
-name=Mayael's Aria
-text=At the beginning of your upkeep, put a +1/+1 counter on each creature you control if you control a creature with power 5 or greater. Then you gain 10 life if you control a creature with power 10 or greater. Then you win the game if you control a creature with power 20 or greater.
-mana={R}{G}{W}
-type=Enchantment
-[/card]
-[card]
 name=Meadowboon
 text=When Meadowboon leaves the battlefield, put a +1/+1 counter on each creature target player controls. -- Evoke {3}{W} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
 mana={2}{W}{W}
@@ -23183,12 +23096,6 @@ type=Tribal Sorcery
 subtype=Rogue
 [/card]
 [card]
-name=Mortal Combat
-text=At the beginning of your upkeep, if twenty or more creature cards are in your graveyard, you win the game.
-mana={2}{B}{B}
-type=Enchantment
-[/card]
-[card]
 name=Mortipede
 text={2}{G}: All creatures able to block Mortipede this turn do so.
 mana={3}{B}
@@ -32922,16 +32829,6 @@ mana={1}{R}
 type=Sorcery
 [/card]
 [card]
-name=Sift
-target=*|myhand
-auto=draw:3 controller
-auto=moveto(mygraveyard)
-#the following works but you have to discard first then you draw 3 cards. no other combination would work because moveto(x) target(y) when put in play does not work
-text=Draw three cards, then discard a card.
-mana={3}{U}
-type=Sorcery
-[/card]
-[card]
 name=Sift Through Sands
 text=Draw two cards, then discard a card. -- If you've cast a spell named Peer Through Depths and a spell named Reach Through Mists this turn, you may search your library for a card named The Unspeakable, put it onto the battlefield, then shuffle your library.
 mana={1}{U}{U}
@@ -36997,12 +36894,6 @@ mana={5}{U}{U}
 type=Sorcery
 [/card]
 [card]
-name=Temporal Distortion
-text=Whenever a creature or land becomes tapped, put an hourglass counter on it. -- Permanents with hourglass counters on them don't untap during their controllers' untap steps. -- At the beginning of each player's upkeep, remove all hourglass counters from permanents that player controls.
-mana={3}{U}{U}
-type=Enchantment
-[/card]
-[card]
 name=Temporal Extortion
 text=When you cast Temporal Extortion, any player may pay half his or her life, rounded up. If a player does, counter Temporal Extortion. -- Take an extra turn after this one.
 mana={B}{B}{B}{B}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 5127e24bb..c60aed5bf 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -69,6 +69,26 @@ mana={3}{R}
 type=Enchantment
 [/card]
 [card]
+name=AEther Vial
+auto=@each my upkeep:may counter(0/0.1.Charge)
+auto=this(counter{0/0,1,Charge}<1) {T}:moveTo(myBattlefield) target(creature[manacost=0]|myhand)
+auto=this(counter{0/0,1,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=1]|myhand)
+auto=this(counter{0/0,2,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=2]|myhand)
+auto=this(counter{0/0,3,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=3]|myhand)
+auto=this(counter{0/0,4,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=4]|myhand)
+auto=this(counter{0/0,5,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=5]|myhand)
+auto=this(counter{0/0,6,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=6]|myhand)
+auto=this(counter{0/0,7,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=7]|myhand)
+auto=this(counter{0/0,8,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=8]|myhand)
+auto=this(counter{0/0,9,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=9]|myhand)
+auto=this(counter{0/0,10,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=10]|myhand)
+auto=this(counter{0/0,11,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=11]|myhand)
+auto=this(counter{0/0,12,Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=12]|myhand)
+text=At the beginning of your upkeep, you may put a charge counter on AEther Vial. -- {T}: You may put a creature card with converted mana cost equal to the number of charge counters on AEther Vial from your hand onto the battlefield.
+mana={1}
+type=Artifact
+[/card]
+[card]
 name=AEther Web
 abilities=flash
 target=creature
@@ -407,6 +427,17 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Aerie Ouphes
+abilities=persist
+auto={S}:thisforeach(power>=1) damage:1 target(creature[flying])
+text=Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying. -- Persist (When this creature is put into a graveyard from the battlefield, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
+mana={4}{G}
+type=Creature
+subtype=Ouphe
+power=3
+toughness=3
+[/card]
+[card]
 name=Aesthir Glider
 abilities=flying,cantblock
 text=Flying -- Aesthir Glider can't block.
@@ -3469,6 +3500,13 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Battle of Wits
+auto=@each my upkeep:aslongas(*|mylibrary) winGame >199
+text=At the beginning of your upkeep, if you have 200 or more cards in your library, you win the game.
+mana={3}{U}{U}
+type=Enchantment
+[/card]
+[card]
 name=Battle Rampart
 abilities=defender
 auto={T}:haste target(creature)
@@ -3542,17 +3580,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Rafiq of the Many
-abilities=exalted
-auto=@each my combatblockers:aslongas(creature[attacking]|myBattlefield) all(creature[attacking]|myBattlefield) double strike <2
-text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.) -- Whenever a creature you control attacks alone, it gains double strike until end of turn.
-mana={1}{G}{W}{U}
-type=Legendary Creature
-subtype=Human Knight
-power=3
-toughness=3
-[/card]
-[card]
 text=Flying -- Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.) -- Whenever a creature you control attacks alone, it gains lifelink until end of turn.
 abilities=exalted,flying
 auto=@each my combatblockers:aslongas(creature[attacking]|myBattlefield) all(creature[attacking]|myBattlefield) lifelink <2
@@ -3723,7 +3750,7 @@ toughness=2
 [card]
 name=Beastmaster Ascension
 auto=@each my blockers:foreach(creature[attacking]|myBattlefield) counter(0/0,1,Quest)
-auto=(counter{0/0.7.Level Up}) lord(creature|myBattlefield) 5/5
+auto=(counter{0/0.7.Quest}) lord(creature|myBattlefield) 5/5
 text=Whenever a creature you control attacks, you may put a quest counter on Beastmaster Ascension. -- As long as Beastmaster Ascension has seven or more quest counters on it, creatures you control get +5/+5.
 mana={2}{G}
 type=Enchantment
@@ -6414,9 +6441,9 @@ subtype=Aura
 [card]
 name=Caravan Escort
 auto={2}:counter(0/0,1,Level Up) asSorcery 
-auto=this(counter{0/0,1,Level Up}) 1/1
-auto=this(counter{0/0,5,Level Up}) first strike
-auto=this(counter{0/0,5,Level Up}) 3/3
+auto=this(counter{0/0.1.Level Up}) 1/1
+auto=this(counter{0/0.5.Level Up}) first strike
+auto=this(counter{0/0.5.Level Up}) 3/3
 text=Level up {2} -- [Level 1-4] (2/2) -- [Level 5+] First strike (5/5)
 mana={W}
 type=Creature
@@ -6592,6 +6619,14 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Catalog
+auto=draw:2
+auto=moveTo(mygraveyard) target(*|myhand)
+text=Draw two cards, then discard a card.
+mana={2}{U}
+type=Instant
+[/card]
+[card]
 name=Catastrophe
 auto=may destroy all(land)
 auto=may bury all(creature)
@@ -8123,6 +8158,13 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Coalition Victory
+auto=aslongas(plains|myBattlefield)aslongas(island|myBattlefield)aslongas(swamp|myBattlefield)aslongas(mountain|myBattlefield)aslongas(forest|myBattlefield)aslongas(creature[white]|myBattlefield)aslongas(creature[blue]|myBattlefield)aslongas(creature[black]|myBattlefield)aslongas(creature[red]|myBattlefield)aslongas(creature[green]|myBattlefield) winGame
+text=You win the game if you control a land of each basic land type and a creature of each color.
+mana={3}{W}{U}{B}{R}{G}
+type=Sorcery
+[/card]
+[card]
 name=Coast Watcher
 abilities=Flying,protection from green
 text=Flying, protection from green
@@ -9485,7 +9527,7 @@ power=0
 toughness=0
 [/card]
 [card]
-name=Cytoplast Shambler
+name=Cytospawn Shambler
 auto=counter(1/1,6)
 auto=@movedto(creature|battlefield):this(counter{1/1}) all(trigger) counter(1/1) && this(counter{1/1})  counter(1/1,-1)
 auto={G}:trample target(creature[counter{1/1.1}])
@@ -11491,6 +11533,13 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Door to Nothingness
+auto={W}{W}{U}{U}{B}{B}{R}{R}{G}{G}{T}{S}:winGame
+text=Door to Nothingness enters the battlefield tapped. -- {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}, {T}, Sacrifice Door to Nothingness: Target player loses the game.
+mana={5}
+type=Artifact
+[/card]
+[card]
 name=Dormant Sliver
 auto=lord(sliver) defender
 auto=@movedTo(sliver|myBattlefield):draw:1 controller
@@ -12908,7 +12957,7 @@ toughness=5
 [card]
 name=Elvish Archdruid
 auto=lord(elf|myBattlefield) 1/1 other
-auto={T}:foreach(elf|myBattlefield)add:{G}
+auto={T}:foreach(elf|myBattlefield) add{G}
 text=Other Elf creatures you control get +1/+1. -- {T}: Add {G} to your mana pool for each Elf you control.
 mana={1}{G}{G}
 type=Creature
@@ -13543,6 +13592,13 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Epic Struggle
+auto=@each my upkeep:aslongas(creature|myBattlefield) winGame >19
+text=At the beginning of your upkeep, if you control twenty or more creatures, you win the game.
+mana={2}{G}{G}
+type=Enchantment
+[/card]
+[card]
 name=Erase
 target=enchantment
 auto=moveTo(exile)
@@ -21073,9 +21129,9 @@ toughness=3
 [card]
 name=Ikiral Outrider
 auto={4}:counter(0/0,1,Level Up) asSorcery 
-auto=this(counter{0/0,1,Level Up}) vigilance
-auto=this(counter{0/0,1,Level Up}) 1/4
-auto=this(counter{0/0,4,Level Up}) 1/4
+auto=this(counter{0/0.1.Level Up}) vigilance
+auto=this(counter{0/0.1.Level Up}) 1/4
+auto=this(counter{0/0.4.Level Up}) 1/4
 text=Level up {4} -- [Level 1-3] Vigilance (2/6) -- [Level 4+] Vigilance (3/10)
 mana={1}{W}
 type=Creature
@@ -22551,6 +22607,18 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Junk Golem
+auto=counter(1/1,3)
+auto=upcost[{C(1/1,-1}] moveTo(graveyard)
+auto={S(*|myhand)}:counter(1/1)
+text=Junk Golem enters the battlefield with three +1/+1 counters on it. -- At the beginning of your upkeep, sacrifice Junk Golem unless you remove a +1/+1 counter from it. -- {1}, Discard a card: Put a +1/+1 counter on Junk Golem.
+mana={4}
+type=Artifact Creature
+subtype=Golem
+power=0
+toughness=0
+[/card]
+[card]
 name=Juntu Stakes
 auto=lord(creature[power<=1]) doesnotuntap
 text=Creatures with power 1 or less don't untap during their controllers' untap steps.
@@ -22635,10 +22703,10 @@ type=Land
 [card]
 name=Kabira Vindicator
 auto={2}{W}:counter(0/0,1,Level Up) asSorcery 
-auto=this(counter{0/0,2,Level Up}) lord(creature|myBattlefield) 1/1 other
-auto=this(counter{0/0,2,Level Up}) 1/2
-auto=this(counter{0/0,5,Level Up}) lord(creature|myBattlefield) 1/1 other
-auto=this(counter{0/0,5,Level Up}) 1/2
+auto=this(counter{0/0.2.Level Up}) lord(creature|myBattlefield) 1/1 other
+auto=this(counter{0/0.2.Level Up}) 1/2
+auto=this(counter{0/0.5.Level Up}) lord(creature|myBattlefield) 1/1 other
+auto=this(counter{0/0.5.Level Up}) 1/2
 text=Level up {2}{W} -- [Level 2-4] Other creatures you control get +1/+1. (3/6) -- [Level 5+] Other creatures you control get +1/+1. (4/8)
 mana={3}{W}
 type=Creature
@@ -26907,6 +26975,15 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Mayael's Aria
+auto=@each my upkeep:aslongas(creature[power>=20]|myBattlefield) winGame
+auto=@each my upkeep:aslongas(creature[power>=10]|myBattlefield) life:10
+auto=@each my upkeep:aslongas(creature[power>=5]|myBattlefield) counter(1/1) target(creature)
+text=At the beginning of your upkeep, put a +1/+1 counter on each creature you control if you control a creature with power 5 or greater. Then you gain 10 life if you control a creature with power 10 or greater. Then you win the game if you control a creature with power 20 or greater.
+mana={R}{G}{W}
+type=Enchantment
+[/card]
+[card]
 name=Maze of Ith
 auto={T}:untap target(creature[attacking]) && preventAllCombatDamage to(mytgt) ueot && preventAllCombatDamage from(mytgt) ueot
 text={T}: Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
@@ -28358,6 +28435,13 @@ power=6
 toughness=4
 [/card]
 [card]
+name=Mortal Combat
+auto=@each my upkeep:aslongas(creature|mygraveyard) winGame >19
+text=At the beginning of your upkeep, if twenty or more creature cards are in your graveyard, you win the game.
+mana={2}{B}{B}
+type=Enchantment
+[/card]
+[card]
 name=Mortal Wound
 target=creature
 auto=@damaged(mytgt):destroy
@@ -33515,6 +33599,17 @@ power=3
 toughness=2
 [/card]
 [card]
+name=Rafiq of the Many
+abilities=exalted
+auto=@each my combatblockers:aslongas(creature[attacking]|myBattlefield) all(creature[attacking]|myBattlefield) double strike <2
+text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.) -- Whenever a creature you control attacks alone, it gains double strike until end of turn.
+mana={1}{G}{W}{U}
+type=Legendary Creature
+subtype=Human Knight
+power=3
+toughness=3
+[/card]
+[card]
 name=Rage Nimbus
 abilities=defender,flying
 auto={1}{R}:mustattack target(creature)
@@ -39558,7 +39653,7 @@ auto=this(counter{0/0.1.Level Up}) flying
 auto=this(counter{0/0.1.Level Up}) 1/1
 auto=this(counter{0/0.3.Level Up}) 2/0
 text=Level up {3} -- [Level 1-2] : Flying (2/2) -- [Level 3+] : Flying (4/2)
-mana={1}{U}
+mana={U}
 type=Creature
 subtype=LevelUp Merfolk Soldier
 power=1
@@ -44041,6 +44136,17 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Temporal Distortion
+auto=@tapped(creature,land):all(trigger) counter(0/0,1,Hourglass)
+auto=lord(creature[counter{0/0.1.Hourglass}]) doesnotuntap
+auto=lord(land[counter{0/0.1.Hourglass}]) doesnotuntap
+auto=@each my upkeep:counter(0/0,-1,Hourglass) all(*[counter{0/0.1.Hourglass}]|myBattlefield)
+auto=@each opponent upkeep:counter(0/0,-1,Hourglass) all(*[counter{0/0.1.Hourglass}]|opponentBattlefield)
+text=Whenever a creature or land becomes tapped, put an hourglass counter on it. -- Permanents with hourglass counters on them don't untap during their controllers' untap steps. -- At the beginning of each player's upkeep, remove all hourglass counters from permanents that player controls.
+mana={3}{U}{U}
+type=Enchantment
+[/card]
+[card]
 name=Temporal Eddy
 target=creature,land
 auto=moveTo(ownerlibrary)
@@ -51577,5 +51683,4 @@ type=Creature
 subtype=Human Wizard
 power=1
 toughness=1
-[/card]
-###########
\ No newline at end of file
+[/card]
\ No newline at end of file