diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb
index 8916915de..3493215f8 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb
@@ -194,7 +194,7 @@ class PokemonStorage
       raise "Trying to copy nil to storage" if !pkmn
       pkmn.time_form_set = nil
       pkmn.form          = 0 if pkmn.isSpecies?(:SHAYMIN)
-      pkmn.heal
+           #pkmn.heal
       self[boxDst,indexDst] = pkmn
     end
     return true
@@ -217,7 +217,7 @@ class PokemonStorage
         if box>=0
           pkmn.time_form_set = nil if pkmn.time_form_set
           pkmn.form          = 0 if pkmn.isSpecies?(:SHAYMIN)
-          pkmn.heal
+          #pkmn.heal
         end
         self[box,i] = pkmn
         return true
@@ -230,7 +230,7 @@ class PokemonStorage
     if @currentBox>=0
       pkmn.time_form_set = nil
       pkmn.form          = 0 if pkmn.isSpecies?(:SHAYMIN)
-      pkmn.heal
+      #pkmn.heal
     end
     for i in 0...maxPokemon(@currentBox)
       if self[@currentBox,i]==nil
diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb
index 65692b94f..0927d97cf 100644
--- a/Data/Scripts/050_AddOns/New Items effects.rb	
+++ b/Data/Scripts/050_AddOns/New Items effects.rb	
@@ -1875,7 +1875,11 @@ ItemHandlers::UseInField.add(:BOXLINK, proc { |item|
   if blacklisted_maps.include?($game_map.map_id)
     Kernel.pbMessage("There doesn't seem to be any network coverage here...")
   else
-    pbPokeCenterPC()
+    pbFadeOutIn {
+      scene = PokemonStorageScene.new
+      screen = PokemonStorageScreen.new(scene,$PokemonStorage)
+      screen.pbStartScreen(0) #Boot PC in organize mode
+    }
   end
   next 1
 })
\ No newline at end of file
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 0ab40fff1..147c3ffdd 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ