diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 1129e3e3a..7126ae0f8 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1932,7 +1932,7 @@ toughness=3
 [/card]
 [card]
 name=Alabaster Leech
-auto=lord(*[white]|myhand,mylibrary,mygraveyard,myexile) altercost(white, +1)
+auto=lord(*[white]|myhand,mygraveyard,myexile) altercost(white, +1)
 text=White spells you cast cost {W} more to cast.
 mana={W}
 type=Creature
@@ -3021,7 +3021,7 @@ type=Land
 [/card]
 [card]
 name=Andradite Leech
-auto=lord(*[black]|myhand,mylibrary,mygraveyard,myexile) altercost(black,+1)
+auto=lord(*[black]|myhand,mygraveyard,myexile) altercost(black,+1)
 auto={B}:1/1
 text=Black spells you cast cost {B} more to cast. -- {B}: Andradite Leech gets +1/+1 until end of turn.
 mana={2}{B}
@@ -3399,7 +3399,7 @@ subtype=Aura
 name=Animar, Soul of Elements
 abilities=protection from white,protection from black
 auto=@movedTo(creature|mystack):counter(1/1,1)
-auto=thisforeach(counter{1/1,1}) lord(creature|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=thisforeach(counter{1/1,1}) lord(creature|myhand,mygraveyard,myexile) altercost(colorless, -1)
 text=Protection from white and from black -- Whenever you cast a creature spell, put a +1/+1 counter on Animar, Soul of Elements. -- Creature spells you cast cost 1 less to cast for each +1/+1 counter on Animar.
 mana={U}{R}{G}
 type=Legendary Creature
@@ -4062,8 +4062,8 @@ type=Enchantment
 [/card]
 [card]
 name=Arcane Melee
-auto=lord(instant|hand,library,graveyard,exile) altercost(colorless,-2)
-auto=lord(sorcery|hand,library,graveyard,exile) altercost(colorless,-2)
+auto=lord(instant|hand,graveyard,exile) altercost(colorless,-2)
+auto=lord(sorcery|hand,graveyard,exile) altercost(colorless,-2)
 text=Instant and sorcery spells cost {2} less to cast.
 mana={4}{U}
 type=Enchantment
@@ -5849,8 +5849,8 @@ subtype=Aura
 [/card]
 [card]
 name=Aura of Silence
-auto=lord(artifact|opponenthand,opponentlibrary,opponentgraveyard,opponentexile) altercost(colorless, +2)
-auto=lord(enchantment|opponenthand,opponentlibrary,opponentgraveyard,opponentexile) altercost(colorless, +2)
+auto=lord(artifact|opponenthand,opponentgraveyard,opponentexile) altercost(colorless, +2)
+auto=lord(enchantment|opponenthand,opponentgraveyard,opponentexile) altercost(colorless, +2)
 auto={S}:destroy target(artifact,enchantment)
 text=Artifact and enchantment spells your opponents cast cost {2} more to cast. -- Sacrifice Aura of Silence: Destroy target artifact or enchantment.
 mana={1}{W}{W}
@@ -7193,7 +7193,7 @@ toughness=2
 [/card]
 [card]
 name=Ballyrush Banneret
-auto=lord(*[soldier;kithkin]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(*[soldier;kithkin]|myhand,mygraveyard,myexile) altercost(colorless, -1)
 text=Kithkin spells and Soldier spells you cast cost {1} less to cast.
 mana={1}{W}
 type=Creature
@@ -11953,7 +11953,7 @@ toughness=7
 [/card]
 [card]
 name=Bosk Banneret
-auto=lord(*[treefolk;shaman]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(*[treefolk;shaman]|myhand,mygraveyard,myexile) altercost(colorless, -1)
 text=Treefolk spells and Shaman spells you cast cost {1} less to cast.
 mana={1}{G}
 type=Creature
@@ -12667,7 +12667,7 @@ type=Enchantment
 [/card]
 [card]
 name=Brighthearth Banneret
-auto=lord(*[elemental;warrior]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(*[elemental;warrior]|myhand,mygraveyard,myexile) altercost(colorless, -1)
 autohand={1}{R}{discard}:counter(1/1,1) target(creature)
 text=Elemental spells and Warrior spells you cast cost {1} less to cast. -- Reinforce 1 - {1}{R} ({1}{R}, Discard this card: Put a +1/+1 counter on target creature.)
 mana={1}{R}
@@ -15406,7 +15406,7 @@ toughness=3
 [/card]
 [card]
 name=Centaur Omenreader
-auto=this(tapped) lord(*|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -2) ueot
+auto=this(tapped) lord(*|myhand,mygraveyard,myexile) altercost(colorless, -2) ueot
 auto=@untapped(this):all(*|myhand) moveto(myhand)
 text=As long as Centaur Omenreader is tapped, creature spells you cast cost {2} less to cast.
 mana={3}{G}
@@ -16456,8 +16456,8 @@ toughness=1
 [/card]
 [card]
 name=Chill
-auto=lord(*[red]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, +2)
-auto=lord(*[red]|opponenthand,opponentlibrary,opponentgraveyard,opponentexile) altercost(colorless, +2)
+auto=lord(*[red]|myhand,mygraveyard,myexile) altercost(colorless, +2)
+auto=lord(*[red]|opponenthand,opponentgraveyard,opponentexile) altercost(colorless, +2)
 text=Red spells cost {2} more to cast.
 mana={1}{U}
 type=Enchantment
@@ -17744,11 +17744,11 @@ auto=choice name(Creature) counter(0/0,1,CloudKeyC) all(this)
 auto=choice name(Enchantment) counter(0/0,1,CloudKeyE) all(this)
 auto=choice name(Instant) counter(0/0,1,CloudKeyI) all(this)
 auto=choice name(Sorcery) counter(0/0,1,CloudKeyS) all(this)
-auto=this(counter{0/0.1.CloudKeyA}) lord(Artifact|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
-auto=this(counter{0/0.1.CloudKeyC}) lord(Creature|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
-auto=this(counter{0/0.1.CloudKeyE}) lord(Enchantment|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
-auto=this(counter{0/0.1.CloudKeyI}) lord(Instant|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
-auto=this(counter{0/0.1.CloudKeyS}) lord(Sorcery|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=this(counter{0/0.1.CloudKeyA}) lord(Artifact|myhand,mygraveyard,myexile) altercost(colorless,-1)
+auto=this(counter{0/0.1.CloudKeyC}) lord(Creature|myhand,mygraveyard,myexile) altercost(colorless,-1)
+auto=this(counter{0/0.1.CloudKeyE}) lord(Enchantment|myhand,mygraveyard,myexile) altercost(colorless,-1)
+auto=this(counter{0/0.1.CloudKeyI}) lord(Instant|myhand,mygraveyard,myexile) altercost(colorless,-1)
+auto=this(counter{0/0.1.CloudKeyS}) lord(Sorcery|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=As Cloud Key enters the battlefield, choose artifact, creature, enchantment, instant, or sorcery. -- Spells you cast of the chosen type cost {1} less to cast.
 mana={3}
 type=Artifact
@@ -22233,7 +22233,7 @@ toughness=1
 [/card]
 [card]
 name=Daru Warchief
-auto=lord(soldier|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(soldier|myhand,mygraveyard,myexile) altercost(colorless, -1)
 auto=lord(soldier|myBattlefield) 1/2
 text=Soldier spells you cast cost {1} less to cast. -- Soldier creatures you control get +1/+2.
 mana={2}{W}{W}
@@ -24248,7 +24248,7 @@ toughness=1
 [/card]
 [card]
 name=Derelor
-auto=lord(*[black]|myhand,mylibrary,mygraveyard,myexile) altercost(black, +1)
+auto=lord(*[black]|myhand,mygraveyard,myexile) altercost(black, +1)
 text=Black spells you cast cost {B} more to cast.
 mana={3}{B}
 type=Creature
@@ -26509,7 +26509,7 @@ toughness=5
 [/card]
 [card]
 name=Dragonlord's Servant
-auto=lord(dragon|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(dragon|myhand,mygraveyard,myexile) altercost(colorless, -1)
 text=Dragon spells you cast cost {1} less to cast.
 mana={1}{R}
 type=Creature
@@ -26576,7 +26576,7 @@ toughness=2
 [/card]
 [card]
 name=Dragonspeaker Shaman
-auto=lord(dragon|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
+auto=lord(dragon|myhand,mygraveyard,myexile) altercost(colorless,-2)
 text=Dragon spells you cast cost {2} less to cast.
 mana={1}{R}{R}
 type=Creature
@@ -28818,8 +28818,8 @@ type=Instant
 [/card]
 [card]
 name=Edgewalker
-auto=lord(cleric|myhand,mylibrary,mygraveyard,myexile) altercost(white,-1)
-auto=lord(cleric|myhand,mylibrary,mygraveyard,myexile) altercost(black, -1)
+auto=lord(cleric|myhand,mygraveyard,myexile) altercost(white,-1)
+auto=lord(cleric|myhand,mygraveyard,myexile) altercost(black, -1)
 text=Cleric spells you cast cost {W}{B} less to cast. This effect reduces only the amount of colored mana you pay. (For example, if you cast a Cleric spell with mana cost {1}{W}, it costs {1} to cast.)
 mana={1}{W}{B}
 type=Creature
@@ -30062,7 +30062,7 @@ toughness=1
 [/card]
 [card]
 name=Emerald Medallion
-auto=lord(*[green]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[green]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Green spells you cast cost {1} less to cast.
 mana={2}
 type=Artifact
@@ -31569,7 +31569,7 @@ type=Artifact
 [/card]
 [card]
 name=Etherium Sculptor
-auto=lord(artifact|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(artifact|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Artifact spells you cast cost {1} less to cast.
 mana={1}{U}
 type=Artifact Creature
@@ -32228,7 +32228,7 @@ mana={3}{W}
 [/card]
 [card]
 name=Eye of Ugin
-auto=lord(eldrazi[iscolorless]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
+auto=lord(eldrazi[iscolorless]|myhand,mygraveyard,myexile) altercost(colorless,-2)
 auto={7}{T}:moveTo(myhand) target(creature[iscolorless]|myLibrary)
 text=Colorless Eldrazi spells you cast cost {2} less to cast. -- {7}, {T}: Search your library for a colorless creature card, reveal it, and put it into your hand. Then shuffle your library.
 type=Legendary Land
@@ -33653,7 +33653,7 @@ subtype=Aura
 [/card]
 [card]
 name=Feroz's Ban
-auto=lord(creature|hand,library,graveyard,exile) altercost(colorless,+2)
+auto=lord(creature|hand,graveyard,exile) altercost(colorless,+2)
 text=Creature spells cost {2} more to cast.
 mana={6}
 type=Artifact
@@ -36799,7 +36799,7 @@ toughness=2
 [card]
 name=Frogtosser Banneret
 abilities=haste
-auto=lord(*[goblin;rogue]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(*[goblin;rogue]|myhand,mygraveyard,myexile) altercost(colorless, -1)
 text=Haste -- Goblin spells and Rogue spells you cast cost {1} less to cast.
 mana={1}{B}
 type=Creature
@@ -39817,8 +39817,8 @@ toughness=3
 [/card]
 [card]
 name=Glowrider
-auto=lord(*[-creature]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,+1)
-auto=lord(*[-creature]|opponenthand,opponentlibrary,opponentgraveyard,opponentexile) altercost(colorless, +1)
+auto=lord(*[-creature]|myhand,mygraveyard,myexile) altercost(colorless,+1)
+auto=lord(*[-creature]|opponenthand,opponentgraveyard,opponentexile) altercost(colorless, +1)
 text=Noncreature spells cost {1} more to cast.
 mana={2}{W}
 type=Creature
@@ -40262,7 +40262,7 @@ toughness=4
 [/card]
 [card]
 name=Goblin Electromancer
-auto=lord(*[instant;sorcery]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[instant;sorcery]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Instant and sorcery spells you cast cost {1} less to cast.
 mana={U}{R}
 type=Creature
@@ -40944,7 +40944,7 @@ toughness=3
 [/card]
 [card]
 name=Goblin Warchief
-auto=lord(goblin|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(goblin|myhand,mygraveyard,myexile) altercost(colorless,-1)
 auto=lord(goblin|myBattlefield) haste
 text=Goblin spells you cast cost {1} less to cast. -- Goblin creatures you control have haste.
 mana={1}{R}{R}
@@ -41631,9 +41631,9 @@ toughness=2
 [/card]
 [card]
 name=Grand Arbiter Augustin IV
-auto=lord(*[white]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
-auto=lord(*[blue]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
-auto=lord(*|opponenthand,opponentlibrary,opponentgraveyard,opponentexile) altercost( colorless,+1)
+auto=lord(*[white]|myhand,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[blue]|myhand,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*|opponenthand,opponentgraveyard,opponentexile) altercost( colorless,+1)
 text=White spells you cast cost {1} less to cast. -- Blue spells you cast cost {1} less to cast. -- Spells your opponents cast cost {1} more to cast.
 mana={2}{W}{U}
 type=Legendary Creature
@@ -44972,7 +44972,7 @@ toughness=3
 [card]
 name=Heartless Summoning
 auto=lord(creature|myBattlefield) -1/-1
-auto=lord(creature|myhand,mylibrary,mygraveyard,myexile) altercost( colorless,-2)
+auto=lord(creature|myhand,mygraveyard,myexile) altercost( colorless,-2)
 text=Creature spells you cast cost {2} less to cast. -- Creatures you control get -1/-1
 mana={1}{B}
 type=Enchantment
@@ -45537,7 +45537,7 @@ toughness=1
 [/card]
 [card]
 name=Helm of Awakening
-auto=lord(*|hand,library,graveyard,exile) altercost(colorless,-1)
+auto=lord(*|hand,graveyard,exile) altercost(colorless,-1)
 text=Spells cost {1} less to cast.
 mana={2}
 type=Artifact
@@ -45650,7 +45650,7 @@ toughness=4
 name=Herald of War
 abilities=flying
 auto=@combat(attacking) source(this):counter(1/1,1)
-auto=thisforeach(counter{1/1,1}) lord(*[angel;human]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=thisforeach(counter{1/1,1}) lord(*[angel;human]|myhand,mygraveyard,myexile) altercost(colorless, -1)
 text=Flying -- Whenever Herald of War attacks, put a +1/+1 counter on it.  -- Angel spells and Human spells you cast cost {1} less to cast for each +1/+1 counter on Herald of War.
 mana={3}{W}{W}
 type=Creature
@@ -45688,7 +45688,7 @@ toughness=2
 [/card]
 [card]
 name=Herald of the Pantheon
-auto=lord(enchantment|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(enchantment|myhand,mygraveyard,myexile) altercost(colorless, -1)
 auto=@movedto(enchantment|mystack):choice life:1 controller
 text=Enchantment spells you cast cost {1} less to cast. -- Whenever you cast an enchantment spell, you gain 1 life.
 mana={1}{G}
@@ -45743,7 +45743,7 @@ toughness=4
 [/card]
 [card]
 name=Hero of Iroas
-auto=lord(aura|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(aura|myhand,mygraveyard,myexile) altercost(colorless,-1)
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
 text=Aura spells you cast cost 1 less to cast. -- Heroic -- Whenever you cast a spell that targets Hero of Iroas, put a +1/+1 counter on Hero of Iroas.
 mana={1}{W}
@@ -46009,7 +46009,7 @@ toughness=1
 [/card]
 [card]
 name=High Seas
-auto=lord(creature[red;green]|hand,library,graveyard,exile) altercost(colorless,+1)
+auto=lord(creature[red;green]|hand,graveyard,exile) altercost(colorless,+1)
 text=Red creature spells and green creature spells cost {1} more to cast.
 mana={2}{U}
 type=Enchantment
@@ -49728,7 +49728,7 @@ toughness=2
 [/card]
 [card]
 name=Irini Sengir
-auto=lord(enchantment[white;green]|hand,library,graveyard,exile) altercost(colorless,+1)
+auto=lord(enchantment[white;green]|hand,graveyard,exile) altercost(colorless,+1)
 text=White enchantment spells and green enchantment spells cost {2} more to cast.
 mana={2}{B}{B}
 type=Legendary Creature
@@ -50329,7 +50329,7 @@ toughness=8
 [/card]
 [card]
 name=Jade Leech
-auto=lord(*[green]|myhand,mylibrary,mygraveyard,myexile) altercost(green,+1)
+auto=lord(*[green]|myhand,mygraveyard,myexile) altercost(green,+1)
 text=Green spells you cast cost {G} more to cast.
 mana={2}{G}{G}
 type=Creature
@@ -50684,7 +50684,7 @@ type=Artifact
 [/card]
 [card]
 name=Jet Medallion
-auto=lord(*[black]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[black]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Black spells you cast cost {1} less to cast.
 mana={2}
 type=Artifact
@@ -54656,7 +54656,7 @@ toughness=2
 [/card]
 [card]
 name=Krosan Drover
-auto=lord(creature[manacost>=6]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
+auto=lord(creature[manacost>=6]|myhand,mygraveyard,myexile) altercost(colorless,-2)
 text=Creature spells you cast with converted mana cost 6 or more cost {2} less to cast.
 mana={3}{G}
 type=Creature
@@ -54716,7 +54716,7 @@ toughness=5
 [card]
 name=Krosan Warchief
 auto={1}{G}:regenerate target(beast)
-auto=lord(beast|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(beast|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Beast spells you cast cost {1} less to cast. -- {1}{G}: Regenerate target Beast.
 mana={2}{G}
 type=Creature
@@ -57634,7 +57634,7 @@ type=Artifact
 [/card]
 [card]
 name=Lodestone Golem
-auto=lord(*[-artifact]|hand,library,graveyard,exile) altercost(colorless,+1)
+auto=lord(*[-artifact]|hand,graveyard,exile) altercost(colorless,+1)
 text=Nonartifact spells cost {1} more to cast.
 mana={4}
 type=Artifact Creature
@@ -57693,7 +57693,7 @@ toughness=2
 [/card]
 [card]
 name=Long-Forgotten Gohei
-auto=lord(arcane|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(arcane|myhand,mygraveyard,myexile) altercost(colorless,-1)
 auto=lord(spirit|myBattlefield) 1/1
 text=Arcane spells you cast cost {1} less to cast. -- Spirit creatures you control get +1/+1.
 mana={3}
@@ -59575,8 +59575,8 @@ type=Instant
 [/card]
 [card]
 name=Mana Matrix
-auto=lord(instant|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=lord(enchantment|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
+auto=lord(instant|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=lord(enchantment|myhand,mygraveyard,myexile) altercost(colorless,-2)
 text=Instant and enchantment spells you cast cost up to {2} less to cast.
 mana={6}
 type=Artifact
@@ -63578,7 +63578,7 @@ toughness=4
 [/card]
 [card]
 name=Mistform Warchief
-auto=lord(creature[share!types!]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1) chooseend
+auto=lord(creature[share!types!]|myhand,mygraveyard,myexile) altercost(colorless,-1) chooseend
 auto={T}:activatechooseatype all(this) becomes(removecreaturesubtypes) && becomes(chosentype) ueot activatechooseend
 text=Creature spells you cast that share a creature type with Mistform Warchief cost {1} less to cast. -- {T}: Mistform Warchief becomes the creature type of your choice until end of turn.
 mana={2}{U}
@@ -67652,7 +67652,7 @@ toughness=1
 [/card]
 [card]
 name=Nightscape Familiar
-auto=lord(*[blue;red]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[blue;red]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 auto={1}{B}:regenerate
 text=Blue spells and red spells you cast cost {1} less to cast. -- {1}{B}: Regenerate Nightscape Familiar.
 mana={1}{B}
@@ -71789,7 +71789,7 @@ toughness=7
 [/card]
 [card]
 name=Pearl Medallion
-auto=lord(*[white]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[white]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=White spells you cast cost {1} less to cast.
 mana={2}
 type=Artifact
@@ -73946,7 +73946,7 @@ type=Sorcery
 [/card]
 [card]
 name=Planar Gate
-auto=lord(creature|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
+auto=lord(creature|myhand,mygraveyard,myexile) altercost(colorless,-2)
 text=Creature spells you cast cost up to {2} less to cast.
 mana={6}
 type=Artifact
@@ -77152,8 +77152,8 @@ toughness=3
 [/card]
 [card]
 name=Ragemonger
-auto=lord(minotaur|myhand,mylibrary,mygraveyard,myexile) altercost(black,-1)
-auto=lord(minotaur|myhand,mylibrary,mygraveyard,myexile) altercost(red,-1)
+auto=lord(minotaur|myhand,mygraveyard,myexile) altercost(black,-1)
+auto=lord(minotaur|myhand,mygraveyard,myexile) altercost(red,-1)
 text=Minotaur spells you cast cost BlackRed less to cast. This effect reduces only the amount of colored mana you pay. (For example, if you cast a Minotaur spell with mana cost 2Red, it costs 2 to cast.)
 mana={1}{B}{R}
 type=Creature
@@ -82319,7 +82319,7 @@ toughness=*
 [card]
 name=Ruby Leech
 abilities=first strike
-auto=lord(*[red]|myhand,mylibrary,mygraveyard,myexile) altercost(red,+1)
+auto=lord(*[red]|myhand,mygraveyard,myexile) altercost(red,+1)
 text=First strike -- Red spells you cast cost {R} more to cast.
 mana={1}{R}
 type=Creature
@@ -82329,7 +82329,7 @@ toughness=2
 [/card]
 [card]
 name=Ruby Medallion
-auto=lord(*[red]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[red]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Red spells you cast cost {1} less to cast.
 mana={2}
 type=Artifact
@@ -83896,7 +83896,7 @@ toughness=4
 [card]
 name=Sapphire Leech
 abilities=flying
-auto=lord(*[blue]|myhand,mylibrary,mygraveyard,myexile) altercost(blue,+1)
+auto=lord(*[blue]|myhand,mygraveyard,myexile) altercost(blue,+1)
 text=Flying -- Blue spells you cast cost {U} more to cast.
 mana={1}{U}
 type=Creature
@@ -83906,7 +83906,7 @@ toughness=2
 [/card]
 [card]
 name=Sapphire Medallion
-auto=lord(*[blue]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[blue]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Blue spells you cast cost {1} less to cast.
 mana={2}
 type=Artifact
@@ -86683,20 +86683,20 @@ auto=choice name(Sorcery) moveTo(myexile) notatarget(sorcery|myhand) && counter(
 auto=choice name(Tribal Instant) moveTo(myexile) notatarget(instant[tribal]|myhand) && counter(0/0,1,TribalInstant) all(this)
 auto=choice name(Tribal Sorcery) moveTo(myexile) notatarget(sorcery[tribal]|myhand) && counter(0/0,1,TribalSorcery) all(this)
 auto=choice name(cancel) donothing
-auto=this(counter{0/0.1.Artifact}) lord(artifact|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.ArtifactCreature}) lord(artifact[-creature]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.ArtifactCreature}) lord(creature[-artifact]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.ArtifactCreature}) lord(creature[artifact]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2 )
-auto=this(counter{0/0.1.Creature}) lord(creature|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.Enchantment}) lord(enchantment|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.Instant}) lord(instant|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.Sorcery}) lord(sorcery|myhand,mylibrary,mygraveyard,myexile) altercost( colorless, -2 )
-auto=this(counter{0/0.1.TribalInstant}) lord(tribal[-instant]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.TribalInstant}) lord(instant[-tribal]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.TribalInstant}) lord(instant[tribal]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2 )
-auto=this(counter{0/0.1.TribalSorcery}) lord(tribal[-sorcery]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.TribalSorcery}) lord(sorcery[-tribal]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
-auto=this(counter{0/0.1.TribalSorcery}) lord(sorcery[tribal]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.Artifact}) lord(artifact|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.ArtifactCreature}) lord(artifact[-creature]|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.ArtifactCreature}) lord(creature[-artifact]|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.ArtifactCreature}) lord(creature[artifact]|myhand,mygraveyard,myexile) altercost(colorless,-2 )
+auto=this(counter{0/0.1.Creature}) lord(creature|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.Enchantment}) lord(enchantment|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.Instant}) lord(instant|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.Sorcery}) lord(sorcery|myhand,mygraveyard,myexile) altercost( colorless, -2 )
+auto=this(counter{0/0.1.TribalInstant}) lord(tribal[-instant]|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.TribalInstant}) lord(instant[-tribal]|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.TribalInstant}) lord(instant[tribal]|myhand,mygraveyard,myexile) altercost(colorless,-2 )
+auto=this(counter{0/0.1.TribalSorcery}) lord(tribal[-sorcery]|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.TribalSorcery}) lord(sorcery[-tribal]|myhand,mygraveyard,myexile) altercost(colorless,-2)
+auto=this(counter{0/0.1.TribalSorcery}) lord(sorcery[tribal]|myhand,mygraveyard,myexile) altercost(colorless,-2)
 text=Imprint - When Semblance Anvil enters the battlefield, you may exile a nonland card from your hand. -- Spells you cast that share a card type with the exiled card cost {2} less to cast.
 mana={3}
 type=Artifact
@@ -94156,7 +94156,7 @@ toughness=3
 [/card]
 [card]
 name=Sphere of Resistance
-auto=lord(*|hand,library,graveyard,exile) altercost(colorless,+1)
+auto=lord(*|hand,graveyard,exile) altercost(colorless,+1)
 text=Spells cost {1} more to cast.
 mana={2}
 type=Artifact
@@ -95510,7 +95510,7 @@ type=Artifact
 [card]
 name=Squeeze
 text=Sorcery spells cost {3} more to cast.
-auto=lord(sorcery|hand,library,graveyard,exile) altercost(colorless,+3)
+auto=lord(sorcery|hand,graveyard,exile) altercost(colorless,+3)
 mana={3}{U}
 type=Enchantment
 [/card]
@@ -96508,7 +96508,7 @@ toughness=1
 [/card]
 [card]
 name=Stinkdrinker Daredevil
-auto=lord(giant|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2)
+auto=lord(giant|myhand,mygraveyard,myexile) altercost(colorless,-2)
 text=Giant spells you cast cost {2} less to cast.
 mana={2}{R}
 type=Creature
@@ -96649,7 +96649,7 @@ subtype=Mountain Forest
 [/card]
 [card]
 name=Stone Calendar
-auto=lord(*|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Spells you cast cost up to {1} less to cast.
 mana={5}
 type=Artifact
@@ -96920,7 +96920,7 @@ toughness=2
 [card]
 name=Stonybrook Banneret
 abilities=islandwalk
-auto=lord(*[merfolk;wizard]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(*[merfolk;wizard]|myhand,mygraveyard,myexile) altercost(colorless, -1)
 text=Islandwalk -- Merfolk spells and Wizard spells you cast cost {1} less to cast.
 mana={1}{U}
 type=Creature
@@ -97115,7 +97115,7 @@ toughness=1
 [card]
 name=Stormscape Familiar
 abilities=flying
-auto=lord(*[white;black]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[white;black]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Flying -- White spells and black spells you cast cost {1} less to cast.
 mana={1}{U}
 type=Creature
@@ -98380,7 +98380,7 @@ toughness=1
 [card]
 name=Sunscape Familiar
 abilities=defender
-auto=lord(*[green;blue]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[green;blue]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Defender (This creature can't attack.) -- Green spells and blue spells you cast cost {1} less to cast.
 mana={1}{W}
 type=Creature
@@ -101596,8 +101596,8 @@ toughness=2
 [card]
 name=Thalia, Guardian of Thraben
 abilities=first strike
-auto=lord(*[-creature]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,+1)
-auto=lord(*[-creature]|opponenthand,opponentlibrary,opponentgraveyard,opponentexile) altercost(colorless, +1)
+auto=lord(*[-creature]|myhand,mygraveyard,myexile) altercost(colorless,+1)
+auto=lord(*[-creature]|opponenthand,opponentgraveyard,opponentexile) altercost(colorless, +1)
 text=First Strike -- Noncreature spells cost {1} more to cast.
 mana={1}{W}
 type=Legendary Creature
@@ -102072,7 +102072,7 @@ toughness=7
 [/card]
 [card]
 name=Thorn of Amethyst
-auto=lord(*[-creature]|hand,library,graveyard,exile) altercost(colorless,+1)
+auto=lord(*[-creature]|hand,graveyard,exile) altercost(colorless,+1)
 text=Noncreature spells cost {1} more to cast.
 mana={2}
 type=Artifact
@@ -102146,7 +102146,7 @@ toughness=1
 [/card]
 [card]
 name=Thornscape Familiar
-auto=lord(*[red;white]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[red;white]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=Red spells and white spells you cast cost {1} less to cast.
 mana={1}{G}
 type=Creature
@@ -103026,7 +103026,7 @@ toughness=1
 [card]
 name=Thunderscape Familiar
 abilities=first strike
-auto=lord(*[black;green]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-1)
+auto=lord(*[black;green]|myhand,mygraveyard,myexile) altercost(colorless,-1)
 text=First strike -- Black spells and green spells you cast cost {1} less to cast.
 mana={1}{R}
 type=Creature
@@ -106741,7 +106741,7 @@ toughness=2
 [card]
 name=Undead Warchief
 auto=lord(zombie|myBattlefield) 2/1
-auto=lord(zombie|myhand,mylibrary,mygraveyard,myexile) altercost( colorless,-1)
+auto=lord(zombie|myhand,mygraveyard,myexile) altercost( colorless,-1)
 text=Zombie spells you cast cost {1} less to cast. -- Zombie creatures you control get +2/+1.
 mana={2}{B}{B}
 type=Creature
@@ -107623,7 +107623,7 @@ subtype=Urza's
 [/card]
 [card]
 name=Urza's Filter
-auto=lord(*[multicolor]|hand,library,graveyard,exile) altercost(colorless,-2)
+auto=lord(*[multicolor]|hand,graveyard,exile) altercost(colorless,-2)
 text=Multicolored spells cost up to {2} less to cast.
 mana={4}
 type=Artifact
@@ -107637,7 +107637,7 @@ type=Sorcery
 [/card]
 [card]
 name=Urza's Incubator
-auto=chooseatype lord(creature[chosentype]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless,-2) chooseend
+auto=chooseatype lord(creature[chosentype]|myhand,mygraveyard,myexile) altercost(colorless,-2) chooseend
 text=As Urza's Incubator enters the battlefield, choose a creature type. -- Creature spells of the chosen type cost {2} less to cast.
 mana={3}
 type=Artifact
@@ -111013,7 +111013,7 @@ color=black
 [card]
 name=Vryn Wingmare
 abilities=flying
-auto=lord(*[-creature]|hand,library,graveyard,exile) altercost(colorless, +1)
+auto=lord(*[-creature]|hand,graveyard,exile) altercost(colorless, +1)
 text=Flying -- Noncreature spells cost {1} more to cast.
 mana={2}{W}
 type=Creature
@@ -112232,7 +112232,7 @@ toughness=2
 [card]
 name=Warden of Evos Isle
 abilities=flying
-auto=lord(creature[flying]|myhand,mylibrary,mygraveyard,myexile) altercost(colorless, -1)
+auto=lord(creature[flying]|myhand,mygraveyard,myexile) altercost(colorless, -1)
 text=Flying. -- Creature spells with flying you cast cost 1 less to cast.
 mana={2}{U}
 type=Creature
diff --git a/projects/mtg/include/MTGCardInstance.h b/projects/mtg/include/MTGCardInstance.h
index cd2e45a7e..9bb0edc92 100644
--- a/projects/mtg/include/MTGCardInstance.h
+++ b/projects/mtg/include/MTGCardInstance.h
@@ -255,7 +255,7 @@ public:
     bool isTargetter();
     int cardistargetter;
     int myconvertedcost;
-    ManaCost * computeNewCost(MTGCardInstance * card,ManaCost * oldCost);
+    ManaCost * computeNewCost(MTGCardInstance * card,ManaCost * oldCost, ManaCost * refCost);
 
     void eventattacked();
     void eventattackedAlone();
diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index 35926512f..a00972eb2 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -4174,13 +4174,11 @@ int AAlterCost::testDestroy()
     {
         if (amount > 0)
         {
-            _target->getIncreasedManaCost()->remove(type,amount);
-            refreshCost(_target);//special case for 0 cost.
+            ;
         }
         else
         {
-            _target->getReducedManaCost()->remove(type,abs(amount));
-            refreshCost(_target);//special case for 0 cost.
+            ;
         }
         return MTGAbility::testDestroy();
     }
@@ -4190,8 +4188,10 @@ void AAlterCost::refreshCost(MTGCardInstance * card)
 {
     ManaCost * original = NEW ManaCost();
     original->copy(card->model->data->getManaCost());
-    original->add(card->getIncreasedManaCost());
-    original->remove(card->getReducedManaCost());
+    if(card->getIncreasedManaCost()->getConvertedCost())
+        original->add(card->getIncreasedManaCost());
+    if(card->getReducedManaCost()->getConvertedCost())
+        original->remove(card->getReducedManaCost());
     card->getManaCost()->copy(original);
     delete original;
         return;
@@ -4203,14 +4203,6 @@ void AAlterCost::increaseTheCost(MTGCardInstance * card)
         for(int k = Constants::MTG_COLOR_ARTIFACT; k < Constants::NB_Colors;k++)
         {
             card->getManaCost()->add(k,card->getIncreasedManaCost()->getCost(k));
-            if (card->getManaCost()->getAlternative())
-            {
-                card->getManaCost()->getAlternative()->add(k,card->getIncreasedManaCost()->getCost(k));
-            }
-            if (card->getManaCost()->getBuyback())
-            {
-                card->getManaCost()->getBuyback()->add(k,card->getIncreasedManaCost()->getCost(k));
-            }
         }
     }
     return;
@@ -4223,14 +4215,6 @@ void AAlterCost::decreaseTheCost(MTGCardInstance * card)
         for(int k = Constants::MTG_COLOR_ARTIFACT; k < Constants::NB_Colors;k++)
         {
             card->getManaCost()->remove(k,card->getReducedManaCost()->getCost(k));
-            if (card->getManaCost()->getAlternative())
-            {
-                card->getManaCost()->getAlternative()->remove(k,card->getReducedManaCost()->getCost(k));
-            }
-            if (card->getManaCost()->getBuyback())
-            {
-                card->getManaCost()->getBuyback()->remove(k,card->getReducedManaCost()->getCost(k));
-            }
         }
     }
     return;
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index 2c2983450..25d10a428 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -1015,74 +1015,15 @@ void GameObserver::Affinity()
                 string type = "";
                 //only do any of the following if a card with the stated ability is in your hand.
                 ManaCost * original = NEW ManaCost();
-                ManaCost * alternate = NEW ManaCost();
-                ManaCost * buyback = NEW ManaCost();
-                ManaCost * flashback = NEW ManaCost();
-                ManaCost * retrace = NEW ManaCost();
                 original->copy(card->model->data->getManaCost());
-                alternate->copy(card->model->data->getManaCost()->getAlternative());
-                buyback->copy(card->model->data->getManaCost()->getBuyback());
-                flashback->copy(card->model->data->getManaCost()->getFlashback());
-                retrace->copy(card->model->data->getManaCost()->getRetrace());
-                //have to run alter cost before affinity or the 2 cancel each other out.
                 if(card->getIncreasedManaCost()->getConvertedCost()||card->getReducedManaCost()->getConvertedCost())
                 {
                     if(card->getIncreasedManaCost()->getConvertedCost())
-                    {
                         original->add(card->getIncreasedManaCost());
-                        for(int kc = Constants::MTG_COLOR_ARTIFACT; kc < Constants::NB_Colors;kc++)
-                        {
-                            if (card->getManaCost()->getAlternative())
-                            {
-                                alternate->add(kc,card->getIncreasedManaCost()->getCost(kc));
-                            }
-                            if (card->getManaCost()->getBuyback())
-                            {
-                                buyback->add(kc,card->getIncreasedManaCost()->getCost(kc));
-                            }
-                            if (card->getManaCost()->getFlashback())
-                            {
-                                flashback->add(kc,card->getIncreasedManaCost()->getCost(kc));
-                            }
-                            if (card->getManaCost()->getRetrace())
-                            {
-                                retrace->add(kc,card->getIncreasedManaCost()->getCost(kc));
-                            }
-                        }
-                    }
                     if(card->getReducedManaCost()->getConvertedCost())
-                    {
                         original->remove(card->getReducedManaCost());
-                        for(int kc = Constants::MTG_COLOR_ARTIFACT; kc < Constants::NB_Colors;kc++)
-                        {
-                            if (card->getManaCost()->getAlternative())
-                            {
-                                alternate->remove(kc,card->getReducedManaCost()->getCost(kc));
-                            }
-                            if (card->getManaCost()->getBuyback())
-                            {
-                                buyback->remove(kc,card->getIncreasedManaCost()->getCost(kc));
-                            }
-                            if (card->getManaCost()->getFlashback())
-                            {
-                                flashback->remove(kc,card->getIncreasedManaCost()->getCost(kc));
-                            }
-                            if (card->getManaCost()->getRetrace())
-                            {
-                                retrace->remove(kc,card->getIncreasedManaCost()->getCost(kc));
-                            }
-                        }
-                    }
                     if(card->getManaCost())
                         card->getManaCost()->copy(original);
-                    if(card->getManaCost()->getAlternative())
-                        card->getManaCost()->setAlternative(alternate);
-                    if(card->getManaCost()->getBuyback())
-                        card->getManaCost()->setBuyback(buyback);
-                    if(card->getManaCost()->getFlashback())
-                        card->getManaCost()->setFlashback(flashback);
-                    if(card->getManaCost()->getRetrace())
-                        card->getManaCost()->setRetrace(retrace);
                     if(card->getManaCost()->extraCosts)
                     {
                         for(unsigned int i = 0; i < card->getManaCost()->extraCosts->costs.size();i++)
@@ -1197,11 +1138,6 @@ void GameObserver::Affinity()
                         }
                     }
                 SAFE_DELETE(original);
-
-                SAFE_DELETE(alternate);
-                SAFE_DELETE(buyback);
-                SAFE_DELETE(flashback);
-                SAFE_DELETE(retrace);
             }//end
         }
     }
diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp
index cd0f4552e..4fd86e04c 100644
--- a/projects/mtg/src/MTGCardInstance.cpp
+++ b/projects/mtg/src/MTGCardInstance.cpp
@@ -919,23 +919,22 @@ JQuadPtr MTGCardInstance::getIcon()
     return WResourceManager::Instance()->RetrieveCard(this, CACHE_THUMB);
 }
 
-ManaCost * MTGCardInstance::computeNewCost(MTGCardInstance * card,ManaCost * oldCost)
+ManaCost * MTGCardInstance::computeNewCost(MTGCardInstance * card,ManaCost * newCost, ManaCost * refCost)
 {
-    if(card->isLand())
-        return oldCost;
-
     if(!card)
-        return oldCost;
-        //use forcedalive//
-        //pay zero costs//
-        //kicker???...//
-        //morph cost todo//
+        return NULL;
+        if(card->getIncreasedManaCost()->getConvertedCost())
+            newCost->add(card->getIncreasedManaCost());
+        if(card->getReducedManaCost()->getConvertedCost())
+            newCost->remove(card->getReducedManaCost());
+        if(refCost->extraCosts)
+            newCost->extraCosts = refCost->extraCosts;
         //trinisphere must be here below//
     if(card->has(Constants::TRINISPHERE))
-        for(int jj = oldCost->getConvertedCost(); jj < 3; jj++)
-            oldCost->add(Constants::MTG_COLOR_ARTIFACT, 1);
+        for(int jj = newCost->getConvertedCost(); jj < 3; jj++)
+            newCost->add(Constants::MTG_COLOR_ARTIFACT, 1);
 
-    return oldCost;
+    return newCost;
 }
 
 MTGCardInstance * MTGCardInstance::getNextPartner()
diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp
index 5972c999d..d6ff3bae9 100644
--- a/projects/mtg/src/MTGRules.cpp
+++ b/projects/mtg/src/MTGRules.cpp
@@ -629,7 +629,14 @@ int MTGAlternativeCostRule::isReactingToClick(MTGCardInstance * card, ManaCost *
 {
     if (card->alias == 11000)
         return 0;//overload has its own rule
-    ManaCost * alternateCost = card->getManaCost()->getAlternative();
+    if(!card->getManaCost()->getAlternative())
+        return 0;
+    ManaCost * alternateCost = card->computeNewCost(card,NEW ManaCost(card->model->data->getManaCost()->getAlternative()),card->getManaCost()->getAlternative());
+    if(alternateCost->extraCosts)
+        for(unsigned int i = 0; i < alternateCost->extraCosts->costs.size();i++)
+        {
+            alternateCost->extraCosts->costs[i]->setSource(card);
+        }
     if (!game->currentlyActing()->game->hand->hasCard(card) && !game->currentlyActing()->game->graveyard->hasCard(card) && !game->currentlyActing()->game->exile->hasCard(card))
          return 0;
     if ((game->currentlyActing()->game->graveyard->hasCard(card) && !card->has(Constants::CANPLAYFROMGRAVEYARD)) || (game->currentlyActing()->game->exile->hasCard(card) && !card->has(Constants::CANPLAYFROMEXILE)))
@@ -689,9 +696,13 @@ int MTGAlternativeCostRule::reactToClick(MTGCardInstance * card)
     if ( !isReactingToClick(card))
         return 0;
 
-    ManaCost *alternateCost = card->getManaCost()->getAlternative();
+    ManaCost * alternateCost = card->computeNewCost(card,NEW ManaCost(card->model->data->getManaCost()->getAlternative()),card->getManaCost()->getAlternative());
     card->paymenttype = MTGAbility::ALTERNATIVE_COST;
-
+    if(alternateCost->extraCosts)
+        for(unsigned int i = 0; i < alternateCost->extraCosts->costs.size();i++)
+        {
+            alternateCost->extraCosts->costs[i]->setSource(card);
+        }
     return reactToClick(card, alternateCost, ManaCost::MANA_PAID_WITH_ALTERNATIVE);
 }
 
@@ -795,7 +806,15 @@ int MTGBuyBackRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
          return 0;
     if(!allowedToCast(card,player))
         return 0;
-    return MTGAlternativeCostRule::isReactingToClick( card, mana, card->getManaCost()->getBuyback() );
+    if(!card->getManaCost()->getBuyback())
+        return 0;
+    ManaCost * buybackCost = card->computeNewCost(card,NEW ManaCost(card->model->data->getManaCost()->getBuyback()),card->getManaCost()->getBuyback());
+    if(buybackCost->extraCosts)
+        for(unsigned int i = 0; i < buybackCost->extraCosts->costs.size();i++)
+        {
+            buybackCost->extraCosts->costs[i]->setSource(card);
+        }
+    return MTGAlternativeCostRule::isReactingToClick( card, mana, buybackCost );
 }
 
 int MTGBuyBackRule::reactToClick(MTGCardInstance * card) 
@@ -803,11 +822,15 @@ int MTGBuyBackRule::reactToClick(MTGCardInstance * card)
     if (!isReactingToClick(card))
         return 0;
 
-    ManaCost * alternateCost = card->getManaCost()->getBuyback();
-    
+    ManaCost * buybackCost = card->computeNewCost(card,NEW ManaCost(card->model->data->getManaCost()->getBuyback()),card->getManaCost()->getBuyback());
+    if(buybackCost->extraCosts)
+        for(unsigned int i = 0; i < buybackCost->extraCosts->costs.size();i++)
+        {
+            buybackCost->extraCosts->costs[i]->setSource(card);
+        }
     card->paymenttype = MTGAbility::BUYBACK_COST;
 
-    return MTGAlternativeCostRule::reactToClick(card, alternateCost, ManaCost::MANA_PAID_WITH_BUYBACK);
+    return MTGAlternativeCostRule::reactToClick(card, buybackCost, ManaCost::MANA_PAID_WITH_BUYBACK);
 
 }
 
@@ -837,19 +860,31 @@ int MTGFlashBackRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
     Player * player = game->currentlyActing();
     if (!player->game->graveyard->hasCard(card))
         return 0;
-    return MTGAlternativeCostRule::isReactingToClick(card, mana, card->getManaCost()->getFlashback() );
+    if(!card->getManaCost()->getFlashback())
+        return 0;
+    ManaCost * flashbackCost = card->computeNewCost(card,NEW ManaCost(card->model->data->getManaCost()->getFlashback()),card->getManaCost()->getFlashback());
+    if(flashbackCost->extraCosts)
+        for(unsigned int i = 0; i < flashbackCost->extraCosts->costs.size();i++)
+        {
+            flashbackCost->extraCosts->costs[i]->setSource(card);
+        }
+    return MTGAlternativeCostRule::isReactingToClick(card, mana, flashbackCost );
 }
 
 int MTGFlashBackRule::reactToClick(MTGCardInstance * card) 
 {
-    ManaCost * alternateCost = card->getManaCost()->getFlashback();
-    
+    ManaCost * flashbackCost = card->computeNewCost(card,NEW ManaCost(card->model->data->getManaCost()->getFlashback()),card->getManaCost()->getFlashback());
+    if(flashbackCost->extraCosts)
+        for(unsigned int i = 0; i < flashbackCost->extraCosts->costs.size();i++)
+        {
+            flashbackCost->extraCosts->costs[i]->setSource(card);
+        }
     if (!isReactingToClick(card))
         return 0;
 
     card->paymenttype = MTGAbility::FLASHBACK_COST;
 
-    return MTGAlternativeCostRule::reactToClick(card, alternateCost, ManaCost::MANA_PAID_WITH_FLASHBACK);
+    return MTGAlternativeCostRule::reactToClick(card, flashbackCost, ManaCost::MANA_PAID_WITH_FLASHBACK);
 
 }
 
@@ -878,12 +913,19 @@ MTGAlternativeCostRule(observer, _id)
 int MTGRetraceRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
 {
     Player * player = game->currentlyActing();
-    ManaCost * alternateManaCost = card->getManaCost()->getRetrace();
+    if(!card->getManaCost()->getRetrace())
+        return 0;
+    ManaCost * retraceCost = card->computeNewCost(card,NEW ManaCost(card->model->data->getManaCost()->getRetrace()),card->getManaCost()->getRetrace());
+    if(retraceCost->extraCosts)
+        for(unsigned int i = 0; i < retraceCost->extraCosts->costs.size();i++)
+        {
+            retraceCost->extraCosts->costs[i]->setSource(card);
+        }
 
     if (!player->game->graveyard->hasCard(card))
         return 0;
         
-    return MTGAlternativeCostRule::isReactingToClick( card, mana, alternateManaCost  );
+    return MTGAlternativeCostRule::isReactingToClick( card, mana, retraceCost  );
 }
 
 
@@ -891,12 +933,17 @@ int MTGRetraceRule::reactToClick(MTGCardInstance * card)
 {
     if (!isReactingToClick(card))
         return 0;
-    
-    ManaCost * alternateCost = card->getManaCost()->getRetrace();
+
+    ManaCost * retraceCost = card->computeNewCost(card,NEW ManaCost(card->model->data->getManaCost()->getRetrace()),card->getManaCost()->getRetrace());
+    if(retraceCost->extraCosts)
+        for(unsigned int i = 0; i < retraceCost->extraCosts->costs.size();i++)
+        {
+            retraceCost->extraCosts->costs[i]->setSource(card);
+        }
     
     card->paymenttype = MTGAbility::RETRACE_COST;
 
-    return MTGAlternativeCostRule::reactToClick(card, alternateCost, ManaCost::MANA_PAID_WITH_RETRACE);
+    return MTGAlternativeCostRule::reactToClick(card, retraceCost, ManaCost::MANA_PAID_WITH_RETRACE);
 }
 
 ostream& MTGRetraceRule::toString(ostream& out) const