diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index 3cd9f4fa674..5d3203fa528 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -9,7 +9,7 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_full_world_335.21081_2021_08_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.21091_2021_09_28.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-@rev_year@ TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 2ce87dfe2d9..9e5e9a975bc 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1992,7 +1992,8 @@ INSERT INTO `updates` VALUES
 ('2021_06_15_00_auth.sql','DAFFA7699D3BF0A15AE72321AFC9F7D22F33B65C','ARCHIVED','2021-06-15 11:53:33',0),
 ('2021_06_20_00_auth.sql','7CA418D570DC1444C19AAD18F4A50FF187642310','ARCHIVED','2021-06-20 17:29:17',0),
 ('2021_07_15_00_auth.sql','C8B29D477A5A6704775517EF8203871BFE3D4906','ARCHIVED','2021-07-15 07:32:48',0),
-('2021_08_15_00_auth.sql','256E06BF052C246B92B61AD7DD6233D98EEA6E9E','ARCHIVED','2021-08-15 16:59:31',0);
+('2021_08_15_00_auth.sql','256E06BF052C246B92B61AD7DD6233D98EEA6E9E','ARCHIVED','2021-08-15 16:59:31',0),
+('2021_09_28_00_auth.sql','07B3ECF2EBAF1F1C3692059CB3A05B1088A93E18','ARCHIVED','2021-09-28 20:48:10',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2131,4 +2132,4 @@ SET character_set_client = @saved_cs_client;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-08-15 16:59:38
+-- Dump completed on 2021-09-28 20:48:13
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 3a9fc9b4a75..65e1d98bea8 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2666,7 +2666,8 @@ INSERT INTO `updates` VALUES
 ('2021_06_15_00_characters.sql','4432846E2B0769C01E2B333EEDD90ABA44BF2BC1','ARCHIVED','2021-06-15 11:53:33',0),
 ('2021_07_15_00_characters.sql','2ACFF71253DEA0F059476AEA52A55196E6D5DCFE','ARCHIVED','2021-07-15 07:32:48',0),
 ('2021_07_18_00_characters.sql','0BA579ED21F4E75AC2B4797421B5029568B3F6E2','ARCHIVED','2021-07-18 11:55:00',0),
-('2021_08_15_00_characters.sql','A8A32D47C65FB6A0C7995F8342D85B6A50C6C63F','ARCHIVED','2021-08-15 16:59:31',0);
+('2021_08_15_00_characters.sql','A8A32D47C65FB6A0C7995F8342D85B6A50C6C63F','ARCHIVED','2021-08-15 16:59:31',0),
+('2021_09_28_00_characters.sql','A57869AE14FFFA935AB57318F65F4F1217AA2421','ARCHIVED','2021-09-28 20:48:10',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2837,4 +2838,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-08-15 16:59:38
+-- Dump completed on 2021-09-28 20:48:13
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 5c254adf21f..254a4a4871b 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -3385,8 +3385,8 @@ DROP TABLE IF EXISTS `spell_learn_spell`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_learn_spell` (
-  `entry` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SpellID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `entry` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Active` tinyint(3) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`entry`,`SpellID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Item System';
@@ -4044,4 +4044,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-08-15 16:59:38
+-- Dump completed on 2021-09-28 20:48:13
diff --git a/sql/updates/auth/3.3.5/2021_08_15_00_auth.sql b/sql/old/3.3.5a/auth/21081_2021_09_28/2021_08_15_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2021_08_15_00_auth.sql
rename to sql/old/3.3.5a/auth/21081_2021_09_28/2021_08_15_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2021_08_15_00_characters.sql b/sql/old/3.3.5a/characters/21081_2021_09_28/2021_08_15_00_characters.sql
similarity index 100%
rename from sql/updates/characters/3.3.5/2021_08_15_00_characters.sql
rename to sql/old/3.3.5a/characters/21081_2021_09_28/2021_08_15_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2021_08_15_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_15_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_15_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_15_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_15_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_15_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_15_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_15_02_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_15_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_15_02_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_15_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_15_03_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_15_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_15_03_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_15_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_16_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_16_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_16_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_16_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_16_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_16_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_16_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_16_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_16_02_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_16_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_16_02_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_16_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_19_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_19_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_19_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_19_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_19_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_19_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_19_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_19_02_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_19_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_19_02_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_19_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_19_03_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_19_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_19_03_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_19_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_20_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_20_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_20_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_20_01_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_20_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_20_01_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_20_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_20_02_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_20_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_20_02_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_20_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_20_03_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_20_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_20_03_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_20_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_22_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_22_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_22_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_22_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_22_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_22_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_22_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_23_00_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_23_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_23_00_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_23_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_24_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_24_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_24_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_24_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_24_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_24_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_24_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_24_02_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_24_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_24_02_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_24_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_24_03_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_24_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_24_03_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_24_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_29_00_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_29_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_29_00_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_29_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_29_01_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_29_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_29_01_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_29_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_29_02_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_29_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_29_02_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_29_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_29_03_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_29_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_29_03_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_29_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_31_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_31_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_31_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_31_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_31_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_31_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_31_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_31_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_08_31_02_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_31_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_31_02_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_31_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_08_31_03_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_08_31_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_08_31_03_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_08_31_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_04_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_04_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_04_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_05_00_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_05_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_05_00_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_05_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_05_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_05_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_05_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_05_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_05_02_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_05_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_05_02_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_05_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_02_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_02_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_03_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_03_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_04_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_04_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_04_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_05_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_05_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_05_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_06_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_06_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_06_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_07_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_07_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_07_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_08_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_08_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_08_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_08_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_09_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_09_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_09_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_09_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_10_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_10_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_10_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_10_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_09_11_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_11_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_09_11_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_09_11_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_11_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_11_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_11_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_11_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_13_00_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_13_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_13_00_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_13_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_13_01_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_13_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_13_01_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_13_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_13_02_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_13_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_13_02_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_13_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_19_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_19_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_19_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_21_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_21_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_21_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_21_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_21_01_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_21_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_21_01_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_21_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_21_02_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_21_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_21_02_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_21_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_21_03_world_335.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_21_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_21_03_world_335.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_21_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_09_23_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_23_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_23_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_23_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_23_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_23_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_23_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_23_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_25_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_25_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_25_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_25_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_26_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_26_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_26_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_26_01_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_26_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_26_01_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_26_02_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_26_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_26_02_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_26_03_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_26_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_26_03_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_26_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_27_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_27_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_27_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_27_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_09_28_00_world.sql b/sql/old/3.3.5a/world/21081_2021_09_28/2021_09_28_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_09_28_00_world.sql
rename to sql/old/3.3.5a/world/21081_2021_09_28/2021_09_28_00_world.sql
diff --git a/sql/updates/auth/3.3.5/2021_09_28_00_auth.sql b/sql/updates/auth/3.3.5/2021_09_28_00_auth.sql
new file mode 100644
index 00000000000..59d08fb98b4
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2021_09_28_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.21091 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2021_09_28_00_characters.sql b/sql/updates/characters/3.3.5/2021_09_28_00_characters.sql
new file mode 100644
index 00000000000..b8f2d6228f7
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2021_09_28_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.21091 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2021_09_28_01_world.sql b/sql/updates/world/3.3.5/2021_09_28_01_world.sql
new file mode 100644
index 00000000000..59569c06bf9
--- /dev/null
+++ b/sql/updates/world/3.3.5/2021_09_28_01_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.21091 world
+UPDATE `version` SET `db_version`='TDB 335.21091', `cache_id`=21091 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';