diff --git a/.gitattributes b/.gitattributes
index 77fc8b0a28c..d98d79bacd0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2817,6 +2817,7 @@ res/cardsfolder/nightmare.txt -text svneol=native#text/plain
 res/cardsfolder/nightmare_void.txt -text svneol=native#text/plain
 res/cardsfolder/nights_whisper.txt -text svneol=native#text/plain
 res/cardsfolder/nightscape_familiar.txt -text svneol=native#text/plain
+res/cardsfolder/nightscape_master.txt -text svneol=native#text/plain
 res/cardsfolder/nightshade_schemers.txt -text svneol=native#text/plain
 res/cardsfolder/nightshade_stinger.txt -text svneol=native#text/plain
 res/cardsfolder/nightsky_mimic.txt -text svneol=native#text/plain
@@ -4034,6 +4035,7 @@ res/cardsfolder/sunlance.txt -text svneol=native#text/plain
 res/cardsfolder/sunpetal_grove.txt -text svneol=native#text/plain
 res/cardsfolder/sunrise_sovereign.txt -text svneol=native#text/plain
 res/cardsfolder/sunscape_familiar.txt -text svneol=native#text/plain
+res/cardsfolder/sunscape_master.txt -text svneol=native#text/plain
 res/cardsfolder/sunspear_shikari.txt -text svneol=native#text/plain
 res/cardsfolder/suntail_hawk.txt -text svneol=native#text/plain
 res/cardsfolder/sunweb.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/nightscape_master.txt b/res/cardsfolder/nightscape_master.txt
new file mode 100644
index 00000000000..d83c214e714
--- /dev/null
+++ b/res/cardsfolder/nightscape_master.txt
@@ -0,0 +1,10 @@
+Name:Nightscape Master 
+ManaCost:2 B B
+Types:Creature Zombie Wizard
+Text:no text
+PT:2/2
+A:AB$Bounce|Cost$U U T |ValidTgts$Creature|TgtPrompt$Select target Creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand.
+K:abDamageTgtC R R T:2
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nightscape_master.jpg
+End
diff --git a/res/cardsfolder/sunscape_master.txt b/res/cardsfolder/sunscape_master.txt
new file mode 100644
index 00000000000..17b0f172884
--- /dev/null
+++ b/res/cardsfolder/sunscape_master.txt
@@ -0,0 +1,10 @@
+Name:Sunscape Master
+ManaCost:2 W W
+Types:Creature Wizard
+Text:no text
+PT:2/2
+A:AB$Bounce|Cost$U U T |ValidTgts$Creature|TgtPrompt$Select target Creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand.
+K:abAllPump G G T:YouCtrl:+2/+2:Creatures you control get +2/+2 until end of turn.:Sunscape Master - creatures get +2/+2 until EOT.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sunscape_master.jpg
+End
diff --git a/res/cardsfolder/thalakos_drifters.txt b/res/cardsfolder/thalakos_drifters.txt
index bad62b17b46..5baef9f6bf8 100644
--- a/res/cardsfolder/thalakos_drifters.txt
+++ b/res/cardsfolder/thalakos_drifters.txt
@@ -1,8 +1,9 @@
 Name:Thalakos Drifters
 ManaCost:2 U U
-Types:Creature Townsfolk
+Types:Creature Thalakos
 Text:no text
 PT:3/3
+K:abPump Discard<1/Any>:Shadow
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thalakos_drifters.jpg
 End
diff --git a/res/cardsfolder/windreaver.txt b/res/cardsfolder/windreaver.txt
index 3d9dbc6d8d7..706d83e39b8 100644
--- a/res/cardsfolder/windreaver.txt
+++ b/res/cardsfolder/windreaver.txt
@@ -7,5 +7,6 @@ K:Flying
 K:abPump W:Vigilance
 K:abPump W:+0/+1
 SVar:Rarity:Rare
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/windreaver.jpg
 End