diff --git a/.gitattributes b/.gitattributes
index 82f500b676a..e7728796730 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5707,7 +5707,7 @@ res/cardsfolder/ridgetop_raptor.txt -text svneol=native#text/plain
 res/cardsfolder/riding_red_hare.txt -text svneol=native#text/plain
 res/cardsfolder/riding_the_dilu_horse.txt -text svneol=native#text/plain
 res/cardsfolder/rift_bolt.txt -text svneol=native#text/plain
-res/cardsfolder/riftwing_cloudskate.txt svneol=native#text/plain
+res/cardsfolder/riftwing_cloudskate.txt -text svneol=native#text/plain
 res/cardsfolder/righteous_avengers.txt -text svneol=native#text/plain
 res/cardsfolder/righteous_cause.txt svneol=native#text/plain
 res/cardsfolder/righteous_charge.txt -text svneol=native#text/plain
@@ -6082,7 +6082,7 @@ res/cardsfolder/selesnya_evangel.txt -text svneol=native#text/plain
 res/cardsfolder/selesnya_guildmage.txt -text svneol=native#text/plain
 res/cardsfolder/selesnya_sanctuary.txt -text svneol=native#text/plain
 res/cardsfolder/selesnya_signet.txt -text svneol=native#text/plain
-res/cardsfolder/selkie_hedge_mage.txt svneol=native#text/plain
+res/cardsfolder/selkie_hedge_mage.txt -text svneol=native#text/plain
 res/cardsfolder/sell_sword_brute.txt -text svneol=native#text/plain
 res/cardsfolder/sengir_autocrat.txt -text svneol=native#text/plain
 res/cardsfolder/sengir_bats.txt -text svneol=native#text/plain
@@ -6775,7 +6775,7 @@ res/cardsfolder/stifle.txt -text svneol=native#text/plain
 res/cardsfolder/still_life.txt -text svneol=native#text/plain
 res/cardsfolder/stillmoon_cavalier.txt -text svneol=native#text/plain
 res/cardsfolder/stinging_barrier.txt -text svneol=native#text/plain
-res/cardsfolder/stingscourger.txt svneol=native#text/plain
+res/cardsfolder/stingscourger.txt -text svneol=native#text/plain
 res/cardsfolder/stinkdrinker_daredevil.txt -text svneol=native#text/plain
 res/cardsfolder/stinkweed_imp.txt -text svneol=native#text/plain
 res/cardsfolder/stir_the_grave.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/aether_adept.txt b/res/cardsfolder/aether_adept.txt
index 6d021ae339f..74105a20fcd 100644
--- a/res/cardsfolder/aether_adept.txt
+++ b/res/cardsfolder/aether_adept.txt
@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
+SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_adept.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/41.jpg
diff --git a/res/cardsfolder/aethersnipe.txt b/res/cardsfolder/aethersnipe.txt
index 6f2f0a654aa..339fc418f72 100644
--- a/res/cardsfolder/aethersnipe.txt
+++ b/res/cardsfolder/aethersnipe.txt
@@ -5,7 +5,7 @@ Text:
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, return target nonland permanent to its owner's hand.
 K:Evoke:1 U U
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | ValidTgts$ Permanent.nonLand | TgtPrompt$ Choose target non-Land permanent. | Origin$ Battlefield | Destination$ Hand
+SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Choose target non-Land permanent. | Origin$ Battlefield | Destination$ Hand
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+evoked | Execute$ TrigSac | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it by it's evoke cost, sacrifice it.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0
 SVar:Rarity:Common
diff --git a/res/cardsfolder/aven_fogbringer.txt b/res/cardsfolder/aven_fogbringer.txt
index 5b13b9bf001..8c4ac48a9db 100644
--- a/res/cardsfolder/aven_fogbringer.txt
+++ b/res/cardsfolder/aven_fogbringer.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target land to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ Hand
+SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_fogbringer.jpg
 SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/34.jpg
diff --git a/res/cardsfolder/glowing_anemone.txt b/res/cardsfolder/glowing_anemone.txt
index d397556e060..ad7cf18839f 100644
--- a/res/cardsfolder/glowing_anemone.txt
+++ b/res/cardsfolder/glowing_anemone.txt
@@ -4,7 +4,7 @@ Types:Creature Jellyfish Beast
 Text:no text
 PT:1/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target land to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ Hand
+SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glowing_anemone.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/81.jpg
diff --git a/res/cardsfolder/lumengrid_drake.txt b/res/cardsfolder/lumengrid_drake.txt
index 627f445f906..e273e8b67b8 100644
--- a/res/cardsfolder/lumengrid_drake.txt
+++ b/res/cardsfolder/lumengrid_drake.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | Metalcraft$ True | TriggerDescription$ Metalcraft - When CARDNAME enters the battlefield, if you control three or more artifacts, return target creature to its owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
+SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lumengrid_drake.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/36.jpg
diff --git a/res/cardsfolder/riftwing_cloudskate.txt b/res/cardsfolder/riftwing_cloudskate.txt
index c68c2b1a51f..d6f593bee6d 100644
--- a/res/cardsfolder/riftwing_cloudskate.txt
+++ b/res/cardsfolder/riftwing_cloudskate.txt
@@ -1,13 +1,13 @@
-Name:Riftwing Cloudskate
-ManaCost:3 U U
-Types:Creature Illusion
-Text:no text
-PT:2/2
-K:Flying
-K:Suspend:3:1 U
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target permanent to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/riftwing_cloudskate.jpg
-SetInfo:TSP|Uncommon|http://magiccards.info/scans/en/ts/73.jpg
+Name:Riftwing Cloudskate
+ManaCost:3 U U
+Types:Creature Illusion
+Text:no text
+PT:2/2
+K:Flying
+K:Suspend:3:1 U
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target permanent to its owner's hand.
+SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/riftwing_cloudskate.jpg
+SetInfo:TSP|Uncommon|http://magiccards.info/scans/en/ts/73.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/sedraxis_alchemist.txt b/res/cardsfolder/sedraxis_alchemist.txt
index 7fbf28e52f2..927534c982a 100644
--- a/res/cardsfolder/sedraxis_alchemist.txt
+++ b/res/cardsfolder/sedraxis_alchemist.txt
@@ -4,9 +4,9 @@ Types:Creature Zombie Wizard
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Permanent.Blue+YouCtrl | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, if you control a blue permanent, return target nonland permanent to its owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sedraxis_alchemist.jpg
+SVar:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
 SVar:RemAIDeck:True
 SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sedraxis_alchemist.jpg
 SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/54.jpg
 End
diff --git a/res/cardsfolder/selkie_hedge_mage.txt b/res/cardsfolder/selkie_hedge_mage.txt
index f28dd59d55f..caba03956c0 100644
--- a/res/cardsfolder/selkie_hedge_mage.txt
+++ b/res/cardsfolder/selkie_hedge_mage.txt
@@ -1,13 +1,13 @@
-Name:Selkie Hedge-Mage
-ManaCost:2 GU
-Types:Creature Merfolk Wizard
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Forest.YouCtrl | PresentCompare$ GE2 | Execute$ TrigGainLife | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Forests, you may gain 3 life.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Island.YouCtrl | PresentCompare$ GE2 | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Islands, you may return target tapped creature to its owner's hand.
-SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 3
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | Origin$ Battlefield | Destination$ Hand
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/selkie_hedge_mage.jpg
-SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/158.jpg
+Name:Selkie Hedge-Mage
+ManaCost:2 GU
+Types:Creature Merfolk Wizard
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Forest.YouCtrl | PresentCompare$ GE2 | Execute$ TrigGainLife | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Forests, you may gain 3 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Island.YouCtrl | PresentCompare$ GE2 | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Islands, you may return target tapped creature to its owner's hand.
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 3
+SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | Origin$ Battlefield | Destination$ Hand
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/selkie_hedge_mage.jpg
+SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/158.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/stern_proctor.txt b/res/cardsfolder/stern_proctor.txt
index b9b27f388b0..e5a4a1009d6 100644
--- a/res/cardsfolder/stern_proctor.txt
+++ b/res/cardsfolder/stern_proctor.txt
@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:1/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target artifact or enchantment to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Hand
+SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Hand
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/Stern_Proctor.jpg
diff --git a/res/cardsfolder/stingscourger.txt b/res/cardsfolder/stingscourger.txt
index 0324b42be7e..29b3cd9d37c 100644
--- a/res/cardsfolder/stingscourger.txt
+++ b/res/cardsfolder/stingscourger.txt
@@ -1,12 +1,12 @@
-Name:Stingscourger
-ManaCost:1 R
-Types:Creature Goblin Warrior
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature an opponent controls to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature an opponent controls | Origin$ Battlefield | Destination$ Hand
-K:Echo:3 R
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stingscourger.jpg
-SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/107.jpg
+Name:Stingscourger
+ManaCost:1 R
+Types:Creature Goblin Warrior
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature an opponent controls to its owner's hand.
+SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature an opponent controls | Origin$ Battlefield | Destination$ Hand
+K:Echo:3 R
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/stingscourger.jpg
+SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/107.jpg
 End
\ No newline at end of file
diff --git a/src/forge/card/spellability/Spell_Permanent.java b/src/forge/card/spellability/Spell_Permanent.java
index 74b11116fd9..d33d9dde732 100644
--- a/src/forge/card/spellability/Spell_Permanent.java
+++ b/src/forge/card/spellability/Spell_Permanent.java
@@ -245,6 +245,9 @@ public class Spell_Permanent extends Spell {
         	if (params.containsKey("ValidCard") && !params.get("ValidCard").contains("Self"))
         		continue;
         	
+        	if(!tr.requirementsCheck())
+        		continue;
+        	
         	if (tr.getOverridingAbility() != null)	// Don't look at Overriding Abilities yet
         		continue;