diff --git a/projects/mtg/bin/Res/sets/5DN/_cards.dat b/projects/mtg/bin/Res/sets/5DN/_cards.dat
index 44f9e0c32..4e9b4ca79 100644
--- a/projects/mtg/bin/Res/sets/5DN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/5DN/_cards.dat
@@ -454,18 +454,6 @@ toughness=1
 abilities=unblockable
 [/card]
 [card]
-text=Vigilance   As long as Raksha Golden Cub is equipped, Cat creatures you control get +2/+2 and have double strike.
-id=73569
-name=Raksha Golden Cub
-rarity=R
-mana={5}{W}{W}
-type=Creature
-subtype=Cat Soldier
-power=3
-toughness=4
-abilities=vigilance,legendary
-[/card]
-[card]
 text=Relentless Rats gets +1/+1 for each other creature on the battlefield named Relentless Rats.   A deck can have any number of cards named Relentless Rats.
 id=73573
 auto=foreach(relentless rats) 1/1 other
@@ -581,6 +569,15 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+id=51078
+name=Steelshaper's Gift
+mana={W}
+type=Sorcery
+text=Search your library for an Equipment card, reveal that card, and put it into your hand. Then shuffle your library.
+auto=moveTo(myhand) target(equipment|mylibrary)
+rarity=U
+[/card]
+[card]
 text={T}, Put a 2/2 colorless Pincher creature token onto the battlefield.   Whenever an artifact is put into a graveyard from the battlefield, you may untap Summoning Station.
 auto=@movedTo(artifact|graveyard) from(battlefield):may untap
 auto={T}:token(Pincher,creature artifact pincher,2/2,artifact)
diff --git a/projects/mtg/bin/Res/sets/5DN/todo.dat b/projects/mtg/bin/Res/sets/5DN/todo.dat
index 0ea4bd1e6..f685c6fb3 100644
--- a/projects/mtg/bin/Res/sets/5DN/todo.dat
+++ b/projects/mtg/bin/Res/sets/5DN/todo.dat
@@ -651,6 +651,13 @@ mana={0}
 type=Artifact
 subtype=Equipment
 text=Equipped creature has "{T}: Add one mana of any color to your mana pool." Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+auto={1}:equip
+##doesnt work
+auto={T}:Add:{W}
+auto={T}:Add:{U}
+auto={T}:Add:{B}
+auto={T}:Add:{R}
+auto={T}:Add:{G}
 rarity=U
 [/card]
 [card]
@@ -697,8 +704,6 @@ text=Choose one: Destroy target artifact; or destroy target land. Entwine {3}{R}
 rarity=C
 [/card]
 [card]
-# Note: Following card is currently implemented in _cards.dat,
-# but will need to be updated once Equipment is implemented.
 id=73569
 name=Raksha Golden Cub
 mana={5}{W}{W}
@@ -830,6 +835,8 @@ mana={2}
 type=Artifact
 subtype=Equipment
 text=Equipped creature has first strike. {R}{R}: Attach Sparring Collar to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+auto={1}:equip
+auto=first strike
 rarity=C
 [/card]
 [card]
@@ -868,14 +875,7 @@ subtype=Aura
 text=Enchant artifact Enchanted artifact's activated abilities can't be activated. If enchanted artifact is a creature, it can't attack or block.
 rarity=C
 [/card]
-[card]
-id=51078
-name=Steelshaper's Gift
-mana={W}
-type=Sorcery
-text=Search your library for an Equipment card, reveal that card, and put it into your hand. Then shuffle your library.
-rarity=U
-[/card]
+
 [card]
 id=51075
 name=Summoner's Egg
diff --git a/projects/mtg/bin/Res/test/generic/equip_shroud.txt b/projects/mtg/bin/Res/test/generic/equip_shroud.txt
index b53b300a3..6a439e0aa 100644
--- a/projects/mtg/bin/Res/test/generic/equip_shroud.txt
+++ b/projects/mtg/bin/Res/test/generic/equip_shroud.txt
@@ -4,7 +4,7 @@ FIRSTMAIN
 [PLAYER1]
 hand:Whispersilk Cloak
 manapool:{5}
-inplay:Runeclaw Bear
+inplay:Runeclaw Bear,Caravan Hurda
 [PLAYER2]
 hand:Hideous End
 inplay:129754,129756,129755
@@ -24,14 +24,15 @@ next
 129755
 Hideous End
 Runeclaw Bear
+Caravan Hurda
 [ASSERT]
 firstmain
 [PLAYER1]
-life:20
+life:18
 inplay:Runeclaw Bear,Whispersilk Cloak
+graveyard:Caravan Hurda
 [PLAYER2]
-hand:Hideous End
-manapool:{B}{B}{B}
+graveyard:Hideous End
 inplay:129754,129756,129755
 life:20
 [END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/twitch.txt b/projects/mtg/bin/Res/test/twitch.txt
index 8459c3cd7..3b0181046 100644
--- a/projects/mtg/bin/Res/test/twitch.txt
+++ b/projects/mtg/bin/Res/test/twitch.txt
@@ -19,7 +19,7 @@ manapool:{U}{U}{U}{U}{U}{U}
 # to activate both and damage p2. Only one sorcerer
 # should be able to do damage.
 Twitch
-choice 1
+choice 0
 Prodigal Sorcerer
 Prodigal Sorcerer
 p2
@@ -29,7 +29,7 @@ p2
 # both and damage p1. Exactly one sorcerer should be
 # able to do damage.
 Twitch
-choice 0
+choice 1
 Prodigal Sorcerer
 Prodigal Sorcerer
 p1