diff --git a/res/cardsfolder/aura_extraction.txt b/res/cardsfolder/aura_extraction.txt
index 4cd1c68c597..26ca5c9896a 100644
--- a/res/cardsfolder/aura_extraction.txt
+++ b/res/cardsfolder/aura_extraction.txt
@@ -2,7 +2,7 @@ Name:Aura Extraction
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target enchantment on top of its owner's library.
+A:SP$ChangeZone | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target enchantment on top of its owner's library.
 K:Cycling:2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_extraction.jpg
diff --git a/res/cardsfolder/condemn.txt b/res/cardsfolder/condemn.txt
index 905665bcb05..e9e0c437514 100644
--- a/res/cardsfolder/condemn.txt
+++ b/res/cardsfolder/condemn.txt
@@ -2,7 +2,7 @@ Name:Condemn
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ BottomofLibrary | SpellDescription$ Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness. | SubAbility$ GainLifeTgtOwner/dX
+A:SP$ChangeZone | Cost$ W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness. | SubAbility$ GainLifeTgtOwner/dX
 SVar:dX:Count$TgtCardToughness
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/cromat.txt b/res/cardsfolder/cromat.txt
index e44e5b02bc6..60d2e72050f 100644
--- a/res/cardsfolder/cromat.txt
+++ b/res/cardsfolder/cromat.txt
@@ -6,7 +6,7 @@ PT:5/5
 A:AB$Pump | Cost$ U R | KW$ Flying | SpellDescription$ Cromat gains flying until end of turn.
 A:AB$Regenerate | Cost$ B G | SpellDescription$ Regenerate CARDNAME.
 A:AB$Pump | Cost$ R W | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Cromat gets +1/+1 until end of turn.
-A:AB$ChangeZone | Cost$ G U | Origin$ Battlefield | Destination$ TopOfLibrary | SpellDescription$ Put Cromat on top of its owner's library.
+A:AB$ChangeZone | Cost$ G U | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put Cromat on top of its owner's library.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cromat.jpg
 SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/94.jpg
diff --git a/res/cardsfolder/deglamer.txt b/res/cardsfolder/deglamer.txt
index 3e145930ce7..a110de8232c 100644
--- a/res/cardsfolder/deglamer.txt
+++ b/res/cardsfolder/deglamer.txt
@@ -2,7 +2,7 @@ Name:Deglamer
 ManaCost:1 G
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 1 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ ShuffleIntoLibrary | SpellDescription$ Choose target artifact or enchantment. Its owner shuffles it into his or her library.
+A:SP$ChangeZone | Cost$ 1 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ Choose target artifact or enchantment. Its owner shuffles it into his or her library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deglamer.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/118.jpg
diff --git a/res/cardsfolder/disempower.txt b/res/cardsfolder/disempower.txt
index 5213abbd23b..920dd28901a 100644
--- a/res/cardsfolder/disempower.txt
+++ b/res/cardsfolder/disempower.txt
@@ -2,7 +2,7 @@ Name:Disempower
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 1 W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target artifact or enchantment on top of its owner's library.
+A:SP$ChangeZone | Cost$ 1 W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target artifact or enchantment on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disempower.jpg
 SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/213.jpg
diff --git a/res/cardsfolder/excommunicate.txt b/res/cardsfolder/excommunicate.txt
index 25b6940205d..d4146ae0140 100644
--- a/res/cardsfolder/excommunicate.txt
+++ b/res/cardsfolder/excommunicate.txt
@@ -2,7 +2,7 @@ Name:Excommunicate
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target creature on top of its owner's library.
+A:SP$ChangeZone | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/excommunicate.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/14.jpg
diff --git a/res/cardsfolder/fallow_earth.txt b/res/cardsfolder/fallow_earth.txt
index cce27cc80e4..c1c531e5da5 100644
--- a/res/cardsfolder/fallow_earth.txt
+++ b/res/cardsfolder/fallow_earth.txt
@@ -2,7 +2,7 @@ Name:Fallow Earth
 ManaCost:2 G
 Types:Sorcery
 Text:
-A:SP$ChangeZone | Cost$ 2 G | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target land on top of its owner's library.
+A:SP$ChangeZone | Cost$ 2 G | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target land on top of its owner's library.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fallow_earth.jpg
 SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/227.jpg
diff --git a/res/cardsfolder/forced_retreat.txt b/res/cardsfolder/forced_retreat.txt
index 8522a7f86a8..3fc3bff1657 100644
--- a/res/cardsfolder/forced_retreat.txt
+++ b/res/cardsfolder/forced_retreat.txt
@@ -2,7 +2,7 @@ Name:Forced Retreat
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target creature on top of its owner's library.
+A:SP$ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forced_retreat.jpg
 SetInfo:PTK|Common|http://magiccards.info/scans/en/p3k/44.jpg
diff --git a/res/cardsfolder/king_crab.txt b/res/cardsfolder/king_crab.txt
index 5108b993117..ae67886d7d3 100644
--- a/res/cardsfolder/king_crab.txt
+++ b/res/cardsfolder/king_crab.txt
@@ -3,7 +3,7 @@ ManaCost:4 U U
 Types:Creature Crab
 Text:no text
 PT:4/5
-A:AB$ChangeZone | Cost$ 1 U T | ValidTgts$ Creature.Green | TgtPrompt$ Select target green Creature | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target green creature on top of its owner's library.
+A:AB$ChangeZone | Cost$ 1 U T | ValidTgts$ Creature.Green | TgtPrompt$ Select target green Creature | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target green creature on top of its owner's library.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/king_crab.jpg
 SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/34.jpg
diff --git a/res/cardsfolder/plow_under.txt b/res/cardsfolder/plow_under.txt
index 256a5d97d7e..5e63f874dd5 100644
--- a/res/cardsfolder/plow_under.txt
+++ b/res/cardsfolder/plow_under.txt
@@ -2,7 +2,7 @@ Name:Plow Under
 ManaCost:3 G G
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 3 G G | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target Land | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put two target lands on top of their owners' libraries.
+A:SP$ChangeZone | Cost$ 3 G G | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target Land | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put two target lands on top of their owners' libraries.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/plow_under.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/272.jpg
diff --git a/res/cardsfolder/repel.txt b/res/cardsfolder/repel.txt
index 977afc1fd04..4fd92b077e0 100644
--- a/res/cardsfolder/repel.txt
+++ b/res/cardsfolder/repel.txt
@@ -2,7 +2,7 @@ Name:Repel
 ManaCost:3 U
 Types:Instant
 Text:no text
-A:SP$ChangeZone | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target creature on top of its owner's library.
+A:SP$ChangeZone | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/repel.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/98.jpg
diff --git a/res/cardsfolder/rishadan_pawnshop.txt b/res/cardsfolder/rishadan_pawnshop.txt
index fc9dc36ec01..a185671c85a 100644
--- a/res/cardsfolder/rishadan_pawnshop.txt
+++ b/res/cardsfolder/rishadan_pawnshop.txt
@@ -2,7 +2,7 @@ Name:Rishadan Pawnshop
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 2 T | ValidTgts$ Permanent.nonToken+YouCtrl | TgtPrompt$ Select target nontoken permanent you control | Origin$ Battlefield | Destination$ ShuffleIntoLibrary | SpellDescription$ Shuffle target nontoken permanent you control into its owner's library.
+A:AB$ChangeZone | Cost$ 2 T | ValidTgts$ Permanent.nonToken+YouCtrl | TgtPrompt$ Select target nontoken permanent you control | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ Shuffle target nontoken permanent you control into its owner's library.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rishadan_pawnshop.jpg
diff --git a/res/cardsfolder/rootrunner.txt b/res/cardsfolder/rootrunner.txt
index bba3aefcef2..5bd477a8100 100644
--- a/res/cardsfolder/rootrunner.txt
+++ b/res/cardsfolder/rootrunner.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Creature Spirit
 Text:no text
 PT:3/3
-A:AB$ChangeZone | Cost$ G G Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target Land | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target land on top of its owner's library.
+A:AB$ChangeZone | Cost$ G G Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target Land | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target land on top of its owner's library.
 K:Soulshift:3
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rootrunner.jpg
diff --git a/res/cardsfolder/temporal_eddy.txt b/res/cardsfolder/temporal_eddy.txt
index 7aa40d9c5ea..7d5757f372e 100644
--- a/res/cardsfolder/temporal_eddy.txt
+++ b/res/cardsfolder/temporal_eddy.txt
@@ -2,7 +2,7 @@ Name:Temporal Eddy
 ManaCost:2 U U
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 2 U U | ValidTgts$ Creature,Land | TgtPrompt$ Select target creature or land | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target creature or land on top of its owner's library.
+A:SP$ChangeZone | Cost$ 2 U U | ValidTgts$ Creature,Land | TgtPrompt$ Select target creature or land | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature or land on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temporal_eddy.jpg
 SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/85.jpg
diff --git a/res/cardsfolder/temporal_spring.txt b/res/cardsfolder/temporal_spring.txt
index 6e702c135a2..b2f090a9937 100644
--- a/res/cardsfolder/temporal_spring.txt
+++ b/res/cardsfolder/temporal_spring.txt
@@ -2,7 +2,7 @@ Name:Temporal Spring
 ManaCost:1 G U
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 1 G U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target permanent on top of its owner's library.
+A:SP$ChangeZone | Cost$ 1 G U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target permanent on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temporal_spring.jpg
 SetInfo:APC|Common|http://magiccards.info/scans/en/ap/125.jpg
diff --git a/res/cardsfolder/time_ebb.txt b/res/cardsfolder/time_ebb.txt
index 72c4e2a1ef0..cb8ddb19eb3 100644
--- a/res/cardsfolder/time_ebb.txt
+++ b/res/cardsfolder/time_ebb.txt
@@ -2,7 +2,7 @@ Name:Time Ebb
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target creature on top of its owner's library.
+A:SP$ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/time_ebb.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/96.jpg
diff --git a/res/cardsfolder/uproot.txt b/res/cardsfolder/uproot.txt
index 59ce56414e3..d5b7377b3f2 100644
--- a/res/cardsfolder/uproot.txt
+++ b/res/cardsfolder/uproot.txt
@@ -2,7 +2,7 @@ Name:Uproot
 ManaCost:3 G
 Types:Sorcery Arcane
 Text:no text
-A:SP$ChangeZone | Cost$ 3 G | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put target land on top of its owner's library.
+A:SP$ChangeZone | Cost$ 3 G | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put target land on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/uproot.jpg
 SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/149.jpg
diff --git a/res/cardsfolder/wayward_soul.txt b/res/cardsfolder/wayward_soul.txt
index 32eedd68c3b..594db1abc31 100644
--- a/res/cardsfolder/wayward_soul.txt
+++ b/res/cardsfolder/wayward_soul.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:3/2
 K:Flying
-A:AB$ChangeZone | Cost$ U | Origin$ Battlefield | Destination$ TopofLibrary | SpellDescription$ Put CARDNAME on top of its owner's library.
+A:AB$ChangeZone | Cost$ U | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put CARDNAME on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/ex/en-us/card5273.jpg
 SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/51.jpg
diff --git a/src/forge/AbilityFactory_ChangeZone.java b/src/forge/AbilityFactory_ChangeZone.java
index 54ae354b467..a16f3c77167 100644
--- a/src/forge/AbilityFactory_ChangeZone.java
+++ b/src/forge/AbilityFactory_ChangeZone.java
@@ -682,7 +682,7 @@ public class AbilityFactory_ChangeZone {
 		 sb.append(host.getName()).append(" - ");
 		 
 		String destination = params.get("Destination");
-		String origin = params.get("Destination");
+		String origin = params.get("Origin");
 		 
 		 StringBuilder sbTargets = new StringBuilder();