diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index caa4c094a..dc104d0da 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -263,6 +263,20 @@ mana={2}{U}{U}{U}{U}
 type=Enchantment
 [/card]
 [card]
+text=Mindless Automaton enters the battlefield with two +1/+1 counters on it.   {1}, Discard a card: Put a +1/+1 counter on Mindless Automaton.   Remove two +1/+1 counters from Mindless Automaton: Draw a card.
+auto=counter(1/1,2)
+auto={1}{S(*|myhand)}:counter(1/1)
+auto={0}:counter(1/1,-2) && draw:1 controller
+id=5171
+name=Mindless Automaton
+rarity=R
+mana={4}
+type=Artifact Creature
+subtype=Construct
+power=0
+toughness=0
+[/card]
+[card]
 text=First strike, forestwalk, vigilance (This creature deals combat damage before creatures without first strike, it's unblockable as long as defending player controls a Forest, and attacking doesn't cause this creature to tap.)
 id=6155
 name=Mirri, Cat Warrior
@@ -709,4 +723,17 @@ type=Creature
 subtype=Elf Scout
 power=1
 toughness=1
+[/card]
+[card]
+text=Workhorse enters the battlefield with four +1/+1 counters on it. Remove a +1/+1 counter from Workhorse: Add {1} to your mana pool.
+id=6156
+name=Workhorse
+rarity=R
+mana={6}
+type=Artifact Creature
+subtype=Horse
+auto=counter(1/1,4)
+auto={0}:counter(1/1,-1) && add{1}
+power=0
+toughness=0
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/EXO/todo.dat b/projects/mtg/bin/Res/sets/EXO/todo.dat
index b021f042a..ba19fb21f 100644
--- a/projects/mtg/bin/Res/sets/EXO/todo.dat
+++ b/projects/mtg/bin/Res/sets/EXO/todo.dat
@@ -346,17 +346,6 @@ text=When Mind Maggots comes into play, discard any number of creature cards. Fo
 rarity=U
 [/card]
 [card]
-id=5171
-name=Mindless Automaton
-mana={4}
-type=Artifact Creature
-subtype=Construct
-power=0
-toughness=0
-text=Mindless Automaton comes into play with two +1/+1 counters on it. {1}, Discard a card: Put a +1/+1 counter on Mindless Automaton. Remove two +1/+1 counters from Mindless Automaton: Draw a card.
-rarity=R
-[/card]
-[card]
 id=5189
 name=Mirozel
 mana={3}{U}
@@ -736,17 +725,6 @@ text=Defender (This creature can't attack.) At end of combat, remove from the ga
 rarity=R
 [/card]
 [card]
-id=6156
-name=Workhorse
-mana={6}
-type=Artifact Creature
-subtype=Horse
-power=0
-toughness=0
-text=Workhorse comes into play with four +1/+1 counters on it. Remove a +1/+1 counter from Workhorse: Add {1} to your mana pool.
-rarity=R
-[/card]
-[card]
 id=6043
 name=Zealots en-Dal
 mana={3}{W}