diff --git a/res/cardsfolder/oboro_palace_in_the_clouds.txt b/res/cardsfolder/oboro_palace_in_the_clouds.txt
index f895294efb2..fe141c8a07c 100644
--- a/res/cardsfolder/oboro_palace_in_the_clouds.txt
+++ b/res/cardsfolder/oboro_palace_in_the_clouds.txt
@@ -3,6 +3,7 @@ ManaCost:no cost
 Types:Legendary Land
 Text:no text
 K:tap: add U
+A:AB$ChangeZone | Cost$ 1 | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oboro_palace_in_the_clouds.jpg
 SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/164.jpg
diff --git a/src/forge/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java
index a41b0cb3b7d..9c02ce9fbf3 100644
--- a/src/forge/CardFactory_Lands.java
+++ b/src/forge/CardFactory_Lands.java
@@ -353,6 +353,7 @@ class CardFactory_Lands {
             card.addComesIntoPlayCommand(intoPlay);
         }//*************** END ************ END **************************
         
+        
         //*************** START *********** START **************************
         else if(cardName.equals("Vivid Crag") || cardName.equals("Vivid Creek") || cardName.equals("Vivid Grove")
         		|| cardName.equals("Vivid Marsh") || cardName.equals("Vivid Meadow")){
@@ -465,7 +466,7 @@ class CardFactory_Lands {
             
             card.setReflectableMana("WUBRG");
             card.addSpellAbility(tendo);
-            tendo.setDescription("CARDNAME - tap, remove a charge counter: Add one mana of any color to your mana pool");
+            tendo.setDescription("tap, remove a charge counter: Add one mana of any color to your mana pool");
             tendo.setStackDescription("CARDNAME - tap, remove a charge counter: Add one mana of any color to your mana pool");
         }//*************** END ************ END **************************
         
@@ -844,32 +845,6 @@ class CardFactory_Lands {
         }//*************** END ************ END **************************
         
         
-        //*************** START *********** START **************************
-        else if(cardName.equals("Oboro, Palace in the Clouds")) {
-            final Ability ability = new Ability(card, "1") {
-                
-                @Override
-                public boolean canPlayAI() {
-                    return false;
-                }
-                
-                @Override
-                public void resolve() {
-                    PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getController());
-                    AllZone.GameAction.moveTo(hand, card);
-                }
-            };
-            
-            ability.setDescription("1: Return Oboro, Palace in the Clouds to your hand.");
-            StringBuilder sb = new StringBuilder();
-            sb.append("Return ").append(card.getName()).append(" to your hand.");
-            ability.setStackDescription(sb.toString());
-            
-            card.addSpellAbility(ability);
-            
-        }//*************** END ************ END **************************
-        
-        
         //*************** START *********** START **************************
         else if(cardName.equals("Gods' Eye, Gate to the Reikai")) {
             
@@ -895,6 +870,7 @@ class CardFactory_Lands {
             card.addDestroyCommand(makeToken);
         }//*************** END ************ END **************************
         
+        
         //*************** START *********** START **************************
         else if(cardName.equals("Flagstones of Trokair")) {