diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index e2233ece2da..c0ce7009a23 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.22011_2022_01_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.22021_2022_02_16.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 9c59ebd7291..5ab0f5d41c3 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -176,12 +176,12 @@ CREATE TABLE `build_info` (
   `majorVersion` int DEFAULT NULL,
   `minorVersion` int DEFAULT NULL,
   `bugfixVersion` int DEFAULT NULL,
-  `hotfixVersion` char(3) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `winAuthSeed` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `win64AuthSeed` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `mac64AuthSeed` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `winChecksumSeed` varchar(40) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `macChecksumSeed` varchar(40) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `hotfixVersion` char(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `winAuthSeed` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `win64AuthSeed` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `mac64AuthSeed` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `winChecksumSeed` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `macChecksumSeed` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`build`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1998,7 +1998,8 @@ INSERT INTO `updates` VALUES
 ('2021_11_15_00_auth.sql','82D88B06301130C7149E21A991364F62279E219B','ARCHIVED','2021-11-15 16:22:37',0),
 ('2021_12_16_00_auth.sql','A0765C5337833E827B029A5E29F8B7601C81F89E','ARCHIVED','2021-12-16 21:17:10',0),
 ('2022_01_01_00_auth.sql','CDC8349AA1135258D66F351141C0D9AD4EE7EB14','ARCHIVED','2022-01-01 19:35:19',0),
-('2022_01_15_00_auth.sql','A2123CEC10327ECA4C92A8B2212AEE25B43C457B','ARCHIVED','2022-01-15 18:05:55',0);
+('2022_01_15_00_auth.sql','A2123CEC10327ECA4C92A8B2212AEE25B43C457B','ARCHIVED','2022-01-15 18:05:55',0),
+('2022_02_16_00_auth.sql','CFB54EB37319916B1B80E29F5572D12A7D9A33F5','ARCHIVED','2022-02-16 21:52:01',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2137,4 +2138,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 2022-01-15 18:05:58
+-- Dump completed on 2022-02-16 21:52:04
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 5a3b41b5b25..d37088cbf06 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2671,7 +2671,8 @@ INSERT INTO `updates` VALUES
 ('2021_10_15_00_characters.sql','174355CFEA8FADA50B731F54E028561AFCF46AA6','ARCHIVED','2021-10-15 08:43:41',0),
 ('2021_11_15_00_characters.sql','4C911C08E2E7A22E9A2FFC0AAC05481574D8048E','ARCHIVED','2021-11-15 16:22:37',0),
 ('2021_12_16_00_characters.sql','C250DF213B43FC2186520C3901C0A1FBF522BBDF','ARCHIVED','2021-12-16 21:17:10',0),
-('2022_01_15_00_characters.sql','351DEB60A6BB87FD9ED5D097E15ADBC32424C58A','ARCHIVED','2022-01-15 18:05:55',0);
+('2022_01_15_00_characters.sql','351DEB60A6BB87FD9ED5D097E15ADBC32424C58A','ARCHIVED','2022-01-15 18:05:55',0),
+('2022_02_16_00_characters.sql','3086FE1DB569830190013FE0129F9CF072C12D6A','ARCHIVED','2022-02-16 21:52:01',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2842,4 +2843,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2022-01-15 18:05:59
+-- Dump completed on 2022-02-16 21:52:04
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 2b7e24268a1..b51d070b22a 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -248,7 +248,7 @@ CREATE TABLE `broadcast_text` (
   `SoundEntriesID` mediumint unsigned NOT NULL DEFAULT '0',
   `EmotesID` mediumint unsigned NOT NULL DEFAULT '0',
   `Flags` mediumint unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1161,7 +1161,7 @@ CREATE TABLE `game_tele` (
   `map` smallint unsigned NOT NULL DEFAULT '0',
   `name` varchar(100) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1433 DEFAULT CHARSET=utf8mb3 COMMENT='Tele Command';
+) ENGINE=MyISAM AUTO_INCREMENT=1517 DEFAULT CHARSET=utf8mb3 COMMENT='Tele Command';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2091,7 +2091,7 @@ CREATE TABLE `page_text` (
   `ID` mediumint unsigned NOT NULL DEFAULT '0',
   `Text` longtext NOT NULL,
   `NextPageID` mediumint unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Item System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2539,7 +2539,7 @@ CREATE TABLE `quest_details` (
   `EmoteDelay2` int unsigned NOT NULL DEFAULT '0',
   `EmoteDelay3` int unsigned NOT NULL DEFAULT '0',
   `EmoteDelay4` int unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2611,7 +2611,7 @@ CREATE TABLE `quest_offer_reward` (
   `EmoteDelay3` int unsigned NOT NULL DEFAULT '0',
   `EmoteDelay4` int unsigned NOT NULL DEFAULT '0',
   `RewardText` text,
-  `VerifiedBuild` smallint NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2716,7 +2716,7 @@ CREATE TABLE `quest_request_items` (
   `EmoteOnComplete` smallint unsigned NOT NULL DEFAULT '0',
   `EmoteOnIncomplete` smallint unsigned NOT NULL DEFAULT '0',
   `CompletionText` text,
-  `VerifiedBuild` smallint NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4061,4 +4061,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2022-01-15 18:06:00
+-- Dump completed on 2022-02-16 21:52:05
diff --git a/sql/updates/auth/3.3.5/2022_01_15_00_auth.sql b/sql/old/3.3.5a/auth/22011_2022_02_16/2022_01_15_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2022_01_15_00_auth.sql
rename to sql/old/3.3.5a/auth/22011_2022_02_16/2022_01_15_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2022_01_15_00_characters.sql b/sql/old/3.3.5a/characters/22011_2022_02_16/2022_01_15_00_characters.sql
similarity index 100%
rename from sql/updates/characters/3.3.5/2022_01_15_00_characters.sql
rename to sql/old/3.3.5a/characters/22011_2022_02_16/2022_01_15_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2022_01_15_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_15_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_15_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_20_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_20_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_20_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_20_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_20_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_20_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_20_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_20_02_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_20_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_20_02_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_20_02_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_02_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_02_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_02_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_03_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_03_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_03_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_04_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_04_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_04_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_05_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_05_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_05_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_06_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_06_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_06_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_07_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_07_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_07_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_08_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_08_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_08_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_09_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_09_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_09_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_09_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_10_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_10_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_10_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_10_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_11_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_11_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_11_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_11_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_12_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_12_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_12_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_12_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_13_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_13_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_13_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_13_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_14_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_14_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_14_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_14_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_15_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_15_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_15_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_15_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_16_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_16_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_16_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_16_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_22_17_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_17_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_22_17_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_22_17_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_27_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_27_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_27_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_27_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_27_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_27_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_27_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_27_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_28_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_28_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_28_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_28_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_01_28_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_01_28_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_01_28_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_01_28_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_01_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_01_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_01_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_01_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_01_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_01_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_01_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_01_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_01_02_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_01_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_01_02_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_01_02_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_04_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_04_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_04_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_07_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_07_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_07_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_07_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_07_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_07_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_07_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_07_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_07_02_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_07_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_07_02_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_07_02_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_09_00_world_335.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_09_00_world_335.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2022_02_09_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_09_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_09_02_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_09_02_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_02_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_09_03_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_09_03_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_03_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_09_04_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_09_04_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_09_04_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_13_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_13_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_13_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_13_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_13_02_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_13_02_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_02_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_13_03_world_335.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_13_03_world_335.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2022_02_13_04_world_335.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_13_04_world_335.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2022_02_13_05_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_13_05_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_05_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_13_06_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_13_06_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_06_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_13_07_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_13_07_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_13_07_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_14_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_14_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_14_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_14_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_16_00_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_16_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_16_00_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_16_00_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_16_01_world.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_16_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_16_01_world.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_16_01_world.sql
diff --git a/sql/updates/world/3.3.5/2022_02_16_02_world_335.sql b/sql/old/3.3.5a/world/22011_2022_02_16/2022_02_16_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2022_02_16_02_world_335.sql
rename to sql/old/3.3.5a/world/22011_2022_02_16/2022_02_16_02_world_335.sql
diff --git a/sql/updates/auth/3.3.5/2022_02_16_00_auth.sql b/sql/updates/auth/3.3.5/2022_02_16_00_auth.sql
new file mode 100644
index 00000000000..40685cc583a
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2022_02_16_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.22021 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2022_02_16_00_characters.sql b/sql/updates/characters/3.3.5/2022_02_16_00_characters.sql
new file mode 100644
index 00000000000..c50d58c6500
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2022_02_16_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.22021 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2022_02_16_03_world.sql b/sql/updates/world/3.3.5/2022_02_16_03_world.sql
new file mode 100644
index 00000000000..e21707dbfe4
--- /dev/null
+++ b/sql/updates/world/3.3.5/2022_02_16_03_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.22021 world
+UPDATE `version` SET `db_version`='TDB 335.22021', `cache_id`=22021 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';