diff --git a/projects/mtg/bin/Res/sets/5DN/_cards.dat b/projects/mtg/bin/Res/sets/5DN/_cards.dat
index 4e9b4ca79..e5949cbf7 100644
--- a/projects/mtg/bin/Res/sets/5DN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/5DN/_cards.dat
@@ -183,6 +183,18 @@ power=4
 toughness=4
 [/card]
 [card]
+id=51184
+name=Cranial Plating
+mana={2}
+type=Artifact
+subtype=Equipment
+text=Equipped creature gets +1/+0 for each artifact you control. {B}{B}: Attach Cranial Plating to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+auto={1}:equip
+auto=foreach(artifact|myBattlefield) 1/0
+auto={B}{B}:attach
+rarity=C
+[/card]
+[card]
 text=Destroy target creature. It can't be regenerated. You lose life equal to that creature's toughness.
 id=50210
 target=creature
@@ -312,6 +324,19 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+id=51186
+name=Horned Helm
+mana={2}
+type=Artifact
+subtype=Equipment
+text=Equipped creature gets +1/+1 and has trample. {G}{G}: Attach Horned Helm to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+auto={1}:equip
+auto={G}{G}:attach
+auto=1/1
+auto=trample
+rarity=C
+[/card]
+[card]
 text=Haste   Iron-Barb Hellion can't block.
 id=44608
 name=Iron-Barb Hellion
@@ -420,6 +445,18 @@ power=1
 toughness=1
 [/card]
 [card]
+id=51183
+name=Neurok Stealthsuit
+mana={2}
+type=Artifact
+subtype=Equipment
+text=Equipped creature has shroud. (It can't be the target of spells or abilities.) {U}{U}: Attach Neurok Stealthsuit to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+auto={1}:equip
+auto={U}{U}:attach
+auto=shroud
+rarity=C
+[/card]
+[card]
 text=You draw two cards and you lose 2 life.
 id=51178
 name=Night's Whisper
@@ -556,6 +593,18 @@ toughness=1
 abilities=trample,haste
 [/card]
 [card]
+id=51185
+name=Sparring Collar
+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={R}{R}:attach
+auto=first strike
+rarity=C
+[/card]
+[card]
 text={1}: Untap Staff of Domination.   {2}, {T}: You gain 1 life.   {3}, {T}: Untap target creature   {4}, {T}: Tap target creature.   {5}, {T}: Draw a card.
 auto={1}:untap
 auto={2}{T}:life:1 controller
diff --git a/projects/mtg/bin/Res/sets/5DN/todo.dat b/projects/mtg/bin/Res/sets/5DN/todo.dat
index f685c6fb3..223675067 100644
--- a/projects/mtg/bin/Res/sets/5DN/todo.dat
+++ b/projects/mtg/bin/Res/sets/5DN/todo.dat
@@ -213,15 +213,7 @@ toughness=6
 text=Trample At the beginning of your upkeep, sacrifice Cosmic Larva unless you sacrifice two lands.
 rarity=R
 [/card]
-[card]
-id=51184
-name=Cranial Plating
-mana={2}
-type=Artifact
-subtype=Equipment
-text=Equipped creature gets +1/+0 for each artifact you control. {B}{B}: Attach Cranial Plating to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-rarity=C
-[/card]
+
 [card]
 text=You may play land cards from your graveyard.
 # Following line does not work: "May moveto" from graveyards does
@@ -456,15 +448,7 @@ subtype=Equipment
 text=Equipped creature has first strike, trample, and haste. {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it. Equip {2}
 rarity=R
 [/card]
-[card]
-id=51186
-name=Horned Helm
-mana={2}
-type=Artifact
-subtype=Equipment
-text=Equipped creature gets +1/+1 and has trample. {G}{G}: Attach Horned Helm to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-rarity=C
-[/card]
+
 [card]
 id=51086
 name=Hoverguard Sweepers
@@ -615,15 +599,7 @@ toughness=4
 text={3}: Switch Myr Quadropod's power and toughness until end of turn.
 rarity=C
 [/card]
-[card]
-id=51183
-name=Neurok Stealthsuit
-mana={2}
-type=Artifact
-subtype=Equipment
-text=Equipped creature has shroud. (It can't be the target of spells or abilities.) {U}{U}: Attach Neurok Stealthsuit to target creature you control. Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-rarity=C
-[/card]
+
 [card]
 id=50158
 name=Opaline Bracers
@@ -712,6 +688,9 @@ subtype=Cat Soldier
 power=3
 toughness=4
 text=Vigilance As long as Raksha Golden Cub is equipped, Cat creatures you control get +2/+2 and have double strike.
+auto=aslongas(this[equip]) lord(creature[cat]|myBattlefield) 2/2
+auto=aslongas(this[equip]) lord(creature[cat]|myBattlefield) double strike
+#the above is a concept
 rarity=R
 [/card]
 [card]
@@ -828,23 +807,13 @@ toughness=0
 text=Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.) {T}: Double the number of +1/+1 counters on Solarion.
 rarity=R
 [/card]
-[card]
-id=51185
-name=Sparring Collar
-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]
 id=73572
 name=Spectral Shift
 mana={1}{U}
 type=Instant
-text=Choose one  EChange the text of target spell or permanent by replacing all instances of one basic land type with another; or change the text of target spell or permanent by replacing all instances of one color word with another. (These effects last indefinitely.) Entwine {2} (Choose both if you pay the entwine cost.)
+text=Choose one - Change the text of target spell or permanent by replacing all instances of one basic land type with another; or change the text of target spell or permanent by replacing all instances of one color word with another. (These effects last indefinitely.) Entwine {2} (Choose both if you pay the entwine cost.)
 rarity=R
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat
index 8a6e2597f..3f4020eb6 100644
--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -1006,7 +1006,7 @@ id=175043
 name=Resounding Thunder
 target=creature,player
 auto=damage:3
-autohand={5}{G}{W}{U}:cycling && damage:6 target(creature,player)
+autohand={5}{B}{R}{G}:cycling && damage:6 target(creature,player)
 rarity=C
 type=Instant
 mana={2}{R}
diff --git a/projects/mtg/bin/Res/sets/ONS/_cards.dat b/projects/mtg/bin/Res/sets/ONS/_cards.dat
index 3dd0f16da..ac37afe1d 100644
--- a/projects/mtg/bin/Res/sets/ONS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ONS/_cards.dat
@@ -55,6 +55,17 @@ auto={2}{U}{U}:moveTo(myhand)
 abilities=legendary
 [/card]
 [card]
+id=35326
+name=Aura Extraction
+mana={1}{W}
+type=Instant
+target=enchantment
+auto=moveTo(library)
+text=Put target enchantment on top of its owner's library. Cycling {2} ({2}, Discard this card: Draw a card.)
+autohand={2}:cycling
+rarity=U
+[/card]
+[card]
 text=Haste   When Avarax enters the battlefield, you may search your library for a card named Avarax, reveal it, and put it into your hand. If you do, shuffle your library. {1}{R}: Avarax gets +1/+0 until end of turn.
 id=43331
 name=Avarax
@@ -83,6 +94,18 @@ toughness=5
 abilities=flying
 [/card]
 [card]
+id=34196
+name=Barkhide Mauler
+mana={4}{G}
+type=Creature
+subtype=Beast
+autohand={2}:cycling
+power=4
+toughness=4
+text=Cycling {2} ({2}, Discard this card: Draw a card.)
+rarity=C
+[/card]
+[card]
 text=For each opponent, gain control of target permanent that player controls. (This effect doesn't end at end of turn.)
 id=41156
 name=Blatant Thievery
diff --git a/projects/mtg/bin/Res/sets/ONS/todo.dat b/projects/mtg/bin/Res/sets/ONS/todo.dat
index 6f662f84c..2289ff5ce 100644
--- a/projects/mtg/bin/Res/sets/ONS/todo.dat
+++ b/projects/mtg/bin/Res/sets/ONS/todo.dat
@@ -135,14 +135,7 @@ type=Enchantment
 text=Whenever a player cycles a card, you may remove target creature from the game. If you do, return the removed card to play under its owner's control at end of turn.
 rarity=U
 [/card]
-[card]
-id=35326
-name=Aura Extraction
-mana={1}{W}
-type=Instant
-text=Put target enchantment on top of its owner's library. Cycling {2} ({2}, Discard this card: Draw a card.)
-rarity=U
-[/card]
+
 [card]
 id=39900
 name=Aurification
@@ -181,24 +174,8 @@ type=Instant
 text=Turn target creature with morph face down. Cycling {U} ({U}, Discard this card: Draw a card.)
 rarity=C
 [/card]
-[card]
-id=34196
-name=Barkhide Mauler
-mana={4}{G}
-type=Creature
-subtype=Beast
-power=4
-toughness=4
-text=Cycling {2} ({2}, Discard this card: Draw a card.)
-rarity=C
-[/card]
-[card]
-id=41139
-name=Barren Moor
-type=Land
-text=Barren Moor comes into play tapped. {T}: Add {B} to your mana pool. Cycling {B} ({B}, Discard this card: Draw a card.)
-rarity=C
-[/card]
+
+
 [card]
 id=39486
 name=Battering Craghorn
@@ -616,7 +593,10 @@ id=41142
 name=Death Pulse
 mana={2}{B}{B}
 type=Instant
+target=creature
 text=Target creature gets -4/-4 until end of turn. Cycling {1}{B}{B} ({1}{B}{B}, Discard this card: Draw a card.) When you cycle Death Pulse, you may have target creature get -1/-1 until end of turn.
+auto=-4/-4
+auto={1}{B}{B}:cycibgmay -1/-1 target(creature)
 rarity=U
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 411e278b8..36c9f83e3 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -3,6 +3,7 @@
 ########################
 generic/attacks_each_turn.txt
 generic/cycling.txt
+generic/cycling2.txt
 generic/deathtouch.txt
 generic/doesnotuntap.txt
 generic/doesnotuntap2.txt
diff --git a/projects/mtg/bin/Res/test/generic/cycling2.txt b/projects/mtg/bin/Res/test/generic/cycling2.txt
new file mode 100644
index 000000000..d911e3915
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/cycling2.txt
@@ -0,0 +1,25 @@
+#Testing Cycling + extra abilities
+#Nornamlly, this will deal 3 damage
+#but When you cycle Resounding Thunder
+#it deals 6 damage to target creature or player.
+#player 2 controlls a 6 toughness creature
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Resounding Thunder
+library:forest
+manapool:{5}{B}{R}{G}
+[PLAYER2]
+inplay:Nim Grotesque
+[DO]
+Resounding Thunder
+choice 1
+Nim Grotesque
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Resounding Thunder
+hand:forest
+[PLAYER2]
+graveyard:Nim Grotesque
+[END]
\ No newline at end of file