diff --git a/Data/Map256.rxdata b/Data/Map256.rxdata
index b5fcb280e..6d9643c90 100644
Binary files a/Data/Map256.rxdata and b/Data/Map256.rxdata differ
diff --git a/Data/Map278.rxdata b/Data/Map278.rxdata
index 4f26c4117..448ea918c 100644
Binary files a/Data/Map278.rxdata and b/Data/Map278.rxdata differ
diff --git a/Data/Map460.rxdata b/Data/Map460.rxdata
index 5cd099445..4a081b1bc 100644
Binary files a/Data/Map460.rxdata and b/Data/Map460.rxdata differ
diff --git a/Data/Map482.rxdata b/Data/Map482.rxdata
index 18b5b4647..b33ff6081 100644
Binary files a/Data/Map482.rxdata and b/Data/Map482.rxdata differ
diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata
index 72dc94af5..1f251b4d1 100644
Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index df7ed7370..dbc4a5c33 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 0566d9e9f..a8d4fca26 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -5,8 +5,8 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '6.2.2'
-  GAME_VERSION_NUMBER = "6.2.2"
+  GAME_VERSION = '6.2.3'
+  GAME_VERSION_NUMBER = "6.2.3"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb b/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb
index 57b9bbdc9..b381606aa 100644
--- a/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb	
+++ b/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb	
@@ -18,6 +18,9 @@ def pbLoadTrainer(tr_type, tr_name, tr_version = 0)
   raise _INTL("Trainer type {1} does not exist.", tr_type) if !tr_type_data
   tr_type = tr_type_data.id
   trainer_data = getTrainersDataMode.try_get(tr_type, tr_name, tr_version)
+  if !trainer_data
+    trainer_data = GameData::Trainer.try_get(tr_type, tr_name, tr_version)
+  end
   return (trainer_data) ? trainer_data.to_trainer : nil
 end
 
diff --git a/Data/System.rxdata b/Data/System.rxdata
index df3171307..bf193ac10 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ