diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index 270eb9b3b0a..751377772d9 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.20121_2020_12_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.21011_2021_01_15.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2019 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 500bc1d7b65..b5fc36682ae 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.32, for Linux (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	5.7.30-0ubuntu0.18.04.1
+-- Server version	5.7.32-0ubuntu0.18.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1980,7 +1980,8 @@ INSERT INTO `updates` VALUES
 ('2020_10_15_00_auth.sql','8A79DE7DBDF35EBDA5C261BEBF9BC8E5CFF816CE','ARCHIVED','2020-10-15 07:33:13',0),
 ('2020_11_16_00_auth.sql','C0E1AAA8876DB65B2B2FA0AFD5D6CDF233020D37','ARCHIVED','2020-11-16 13:37:22',0),
 ('2020_12_15_00_auth.sql','C416FC93AF6BC33A6CE59185CEB03B4945701233','ARCHIVED','2020-12-15 22:47:26',0),
-('2020_12_31_00_auth.sql','05C9C105D55C6588CDA0D75AE3B135B7E6B54C06','RELEASED','2020-12-31 12:58:21',0);
+('2020_12_31_00_auth.sql','05C9C105D55C6588CDA0D75AE3B135B7E6B54C06','ARCHIVED','2020-12-31 12:58:21',0),
+('2021_01_15_00_auth.sql','604B8B799F031C1074314D4D8081797CC8B22FE2','ARCHIVED','2021-01-15 08:29:32',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2086,4 +2087,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 2020-12-15 22:47:28
+-- Dump completed on 2021-01-15  8:29:39
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index f24e2bbfeef..b6a9d29091b 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.32, for Linux (x86_64)
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	5.7.30-0ubuntu0.18.04.1
+-- Server version	5.7.32-0ubuntu0.18.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2656,7 +2656,8 @@ INSERT INTO `updates` VALUES
 ('2020_09_27_00_characters.sql','441A0E8717165067D13B206F6925EEEA774262F3','ARCHIVED','2020-09-27 00:27:19',0),
 ('2020_10_15_00_characters.sql','72F769B6EFFA4C2C5E08235C89EF2629C0FA82EF','ARCHIVED','2020-10-15 07:33:14',0),
 ('2020_11_16_00_characters.sql','6389519BF44A6EC61E744E6A9727E9448337A276','ARCHIVED','2020-11-16 13:37:22',0),
-('2020_12_15_00_characters.sql','650EE26F85517977FBDEB42CCB97CEFA6462502E','ARCHIVED','2020-12-15 22:47:26',0);
+('2020_12_15_00_characters.sql','650EE26F85517977FBDEB42CCB97CEFA6462502E','ARCHIVED','2020-12-15 22:47:26',0),
+('2021_01_15_00_characters.sql','4D3A4C71ACD4CB04B014C300E1D0B33C0699DBE7','ARCHIVED','2021-01-15 08:29:32',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2827,4 +2828,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-12-15 22:47:28
+-- Dump completed on 2021-01-15  8:29:39
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 2b15b896496..c6150505b32 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.32, for Linux (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	5.7.30-0ubuntu0.18.04.1
+-- Server version	5.7.32-0ubuntu0.18.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3755,6 +3755,20 @@ CREATE TABLE `vehicle_seat_addon` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `vehicle_template`
+--
+
+DROP TABLE IF EXISTS `vehicle_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicle_template` (
+  `creatureId` int(10) unsigned NOT NULL,
+  `despawnDelayMs` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`creatureId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `vehicle_template_accessory`
 --
@@ -4028,4 +4042,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-12-15 22:47:29
+-- Dump completed on 2021-01-15  8:29:39
diff --git a/sql/updates/auth/3.3.5/2020_12_15_00_auth.sql b/sql/old/3.3.5a/auth/20121_2021_01_15/2020_12_15_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2020_12_15_00_auth.sql
rename to sql/old/3.3.5a/auth/20121_2021_01_15/2020_12_15_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2020_12_31_00_auth.sql b/sql/old/3.3.5a/auth/20121_2021_01_15/2020_12_31_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2020_12_31_00_auth.sql
rename to sql/old/3.3.5a/auth/20121_2021_01_15/2020_12_31_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2020_12_15_00_characters.sql b/sql/old/3.3.5a/characters/20121_2021_01_15/2020_12_15_00_characters.sql
similarity index 100%
rename from sql/updates/characters/3.3.5/2020_12_15_00_characters.sql
rename to sql/old/3.3.5a/characters/20121_2021_01_15/2020_12_15_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2020_12_15_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_15_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_15_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_02_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_02_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_03_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_03_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_04_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_04_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_05_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_05_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_05_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_06_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_06_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_06_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_07_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_07_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_07_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_18_08_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_08_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_18_08_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_18_08_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_23_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_23_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_23_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_23_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_23_02_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_23_02_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_23_03_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_23_03_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_23_04_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_23_04_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_23_05_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_05_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_23_05_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_23_06_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_06_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_23_06_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_23_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_24_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_24_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_24_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_24_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_24_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_24_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_24_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_24_02_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_24_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_24_02_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_24_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_24_03_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_24_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_24_03_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_24_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_25_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_25_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_25_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_25_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_25_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_25_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_25_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_25_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_25_02_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_25_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_25_02_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_25_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_27_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_27_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_27_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_27_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_27_02_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_27_02_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_27_03_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_27_03_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_12_27_04_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_27_04_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_27_05_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_27_05_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_27_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_12_31_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2020_12_31_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_12_31_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2020_12_31_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_02_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_02_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_03_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_03_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_04_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_04_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_04_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_05_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_05_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_05_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_06_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_06_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_06_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_07_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_07_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_07_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_08_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_08_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_08_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_08_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_09_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_09_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_09_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_09_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_10_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_10_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_10_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_10_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_11_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_11_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_11_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_11_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_12_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_12_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_12_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_12_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_13_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_13_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_13_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_13_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_14_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_14_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_14_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_14_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_15_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_15_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_15_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_15_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_04_16_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_16_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_04_16_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_04_16_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_02_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_02_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_03_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_03_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_04_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_04_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_05_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_05_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_05_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_06_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_06_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_06_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_07_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_07_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_07_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_06_08_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_06_08_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_06_08_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_07_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_07_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_07_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_07_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_07_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_07_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_07_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_07_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_02_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_02_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_03_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_03_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_04_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_04_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_04_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_05_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_05_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_05_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_06_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_06_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_06_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_07_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_07_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_07_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_08_08_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_08_08_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_08_08_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_10_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_10_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_10_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_10_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_10_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_10_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_10_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_10_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_11_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_11_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_11_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_11_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_11_02_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_11_02_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_11_03_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_11_03_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_11_04_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_11_04_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_11_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_12_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_12_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_12_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_12_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_12_02_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_12_02_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_12_03_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_12_03_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_12_04_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_12_04_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_12_05_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_12_05_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_12_05_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_15_00_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_15_00_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_15_01_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_15_01_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_15_02_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_15_02_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_15_03_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_15_03_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_15_04_world.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_15_04_world.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_04_world.sql
diff --git a/sql/updates/world/3.3.5/2021_01_15_05_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_05_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_15_05_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_01_15_06_world_335.sql b/sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_06_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_01_15_06_world_335.sql
rename to sql/old/3.3.5a/world/20121_2021_01_15/2021_01_15_06_world_335.sql
diff --git a/sql/updates/auth/3.3.5/2021_01_15_00_auth.sql b/sql/updates/auth/3.3.5/2021_01_15_00_auth.sql
new file mode 100644
index 00000000000..53c90c603b5
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2021_01_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.21011 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2021_01_15_00_characters.sql b/sql/updates/characters/3.3.5/2021_01_15_00_characters.sql
new file mode 100644
index 00000000000..3e1b46c9621
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2021_01_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.21011 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2021_01_15_07_world.sql b/sql/updates/world/3.3.5/2021_01_15_07_world.sql
new file mode 100644
index 00000000000..87eeefa890c
--- /dev/null
+++ b/sql/updates/world/3.3.5/2021_01_15_07_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.21011 world
+UPDATE `version` SET `db_version`='TDB 335.21011', `cache_id`=21011 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';