diff --git a/projects/mtg/bin/Res/player/premade/deck1.txt b/projects/mtg/bin/Res/player/premade/deck1.txt
index ef32db48a..9d374e7ad 100644
--- a/projects/mtg/bin/Res/player/premade/deck1.txt
+++ b/projects/mtg/bin/Res/player/premade/deck1.txt
@@ -1,19 +1,7 @@
 #NAME:Premade G/R
 #DESC:A Red/Green deck with simple mechanics to get you started. We recommend you create your own decks to get the full Wagic experience!
 
-Forest (10E) *11
-Mountain (10E) *12
-
-Aggressive Urge (10E) *4
-Wall of Wood (10E) *4
-Llanowar Elves (10E) *4
-Mirri, Cat Warrior (10E)
-Scion of the Wild (10E) *4
-Primal Rage (10E) *2
-
-Lightning Elemental (10E) *4
-Shock (10E) *4
-Firebreathing (10E) *2
-Raging Goblin (10E) *4
-Anaba Bodyguard (10E) *4
+arbor elf *25
 
+Arbiter of Knollridge *13
+Arbor Colossus *13
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 508697533..ab02f2be9 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -4288,20 +4288,15 @@ toughness=5
 [/card]
 [card]
 name=Arbor Colossus
-abilities=reach
-auto=this(cantargetcard(*[-monstrous]) {3}{G}{G}{G}:becomes(monstrous) forever && counter(1/1,3) && transforms((,newAbility[destroy target(creature[flying]|opponentbattlefield)])) forever
-text=Reach -- {3}{G}{G}{G}: Monstrosity 3. (If this creature isn't monstrous, put three +1/+1 counters on it and it becomes monstrous.) -- When Arbor Colossus becomes monstrous, destroy target creature with flying an opponent controls
-mana={2}{G}{G}{G}
-type=Creature
-subtype=Giant
-power=6
-toughness=6
+auto=draw:2
+type=instant
 [/card]
 [card]
 name=Arbor Elf
-auto={t}:untap target(forest)
+autohand={0}:name(Control Magic) activate castcard(normal named!:Control Magic:!)
 text={T}: Untap target Forest.
-mana={G}
+mana={g}
+dredge=dredge(2)
 type=Creature
 subtype=Elf Druid
 power=1
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index dc83fac83..b8cfe6b9c 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -1,3 +1,4 @@
+savor the moment.txt
 ########################
 #Internal tests
 ########################
diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index 8e995dd69..5e664c3f8 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -980,7 +980,11 @@ void MTGInPlay::untapAll()
 
 MTGGameZone * MTGGameZone::intToZone(int zoneId, Player * p, Player * p2)
 {
-
+    if (p2 != p && p2 && (p != p2->opponent()))
+    {
+        p = p2->opponent();
+        //these cases are generally handled this is a edge case fix.
+    }
     switch (zoneId)
     {
     case MY_GRAVEYARD: