diff --git a/Data/Scripts/016_UI/013_PScreen_Load.rb b/Data/Scripts/016_UI/013_PScreen_Load.rb
index 79c32a391..8b838c743 100644
--- a/Data/Scripts/016_UI/013_PScreen_Load.rb
+++ b/Data/Scripts/016_UI/013_PScreen_Load.rb
@@ -1,6 +1,6 @@
 class PokemonLoadPanel < SpriteWrapper
   attr_reader :selected
-  
+
   TEXTCOLOR             = Color.new(232,232,232)
   TEXTSHADOWCOLOR       = Color.new(136,136,136)
   MALETEXTCOLOR         = Color.new(56,160,248)
@@ -19,7 +19,7 @@ class PokemonLoadPanel < SpriteWrapper
     @selected = (index==0)
     @bgbitmap = AnimatedBitmap.new("Graphics/Pictures/loadPanels")
     @refreshBitmap = true
-    @refreshing = false 
+    @refreshing = false
     refresh
   end
 
@@ -356,6 +356,7 @@ class PokemonLoadScreen
           metadata             = Marshal.load(f)
           $PokemonBag          = Marshal.load(f)
           $PokemonStorage      = Marshal.load(f)
+          $SaveVersion         = Marshal.load(f) unless f.eof?
           pbRefreshResizeFactor   # To fix Game_Screen pictures
           magicNumberMatches = false
           if $data_system.respond_to?("magic_number")
@@ -456,12 +457,12 @@ class PokemonLoadScreen
         savedata = []
         if safeExists?(savefile)
           File.open(savefile,"rb") { |f|
-            15.times { savedata.push(Marshal.load(f)) }
+            16.times { savedata.push(Marshal.load(f)) }
           }
           savedata[3]=$PokemonSystem
           begin
             File.open(RTP.getSaveFileName("Game.rxdata"),"wb") { |f|
-              15.times { |i| Marshal.dump(savedata[i],f) }
+              16.times { |i| Marshal.dump(savedata[i],f) }
             }
           rescue
           end
@@ -495,7 +496,7 @@ module FontInstaller
      'pkmnrs.ttf',
      'pkmndp.ttf',
      'pkmnfl.ttf'
-  ]    
+  ]
   # names (not filenames) of fonts to be installed
   Names = [
     'Power Green',
@@ -520,7 +521,7 @@ module FontInstaller
       return ENV['windir'] + '\\Fonts\\'
     else
       return '\\Windows\\Fonts\\'
-    end   
+    end
   end
 
   AFR = Win32API.new('gdi32', 'AddFontResource', ['P'], 'L')
@@ -628,4 +629,4 @@ module FontInstaller
       pbMessage(_INTL("To install the necessary fonts, copy the files in this game's Fonts folder to the Fonts folder in Control Panel."))
     end
   end
-end
\ No newline at end of file
+end
diff --git a/Data/Scripts/016_UI/014_PScreen_Save.rb b/Data/Scripts/016_UI/014_PScreen_Save.rb
index de7c82b4b..d5bec2926 100644
--- a/Data/Scripts/016_UI/014_PScreen_Save.rb
+++ b/Data/Scripts/016_UI/014_PScreen_Save.rb
@@ -24,6 +24,7 @@ def pbSave(safesave=false)
        Marshal.dump($PokemonMap,f)
        Marshal.dump($PokemonBag,f)
        Marshal.dump($PokemonStorage,f)
+       Marshal.dump(ESSENTIALS_VERSION,f)
     }
     Graphics.frame_reset
   rescue
@@ -153,4 +154,4 @@ def pbSaveScreen
   screen = PokemonSaveScreen.new(scene)
   ret = screen.pbSaveScreen
   return ret
-end
\ No newline at end of file
+end