diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index 161dbc92af9..e7e73979332 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.20011_2020_01_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.20021_2020_02_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 44d7229b1c7..879fd7871df 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1955,7 +1955,8 @@ INSERT INTO `updates` VALUES
 ('2019_11_16_00_auth.sql','A7CC55B9329F0DDFE91ADC31BFABD0D934ED0A5E','ARCHIVED','2019-11-16 12:06:06',0),
 ('2019_12_07_00_auth.sql','F354DA31D5B300609C6AE8A25667CA4DE0A7349F','ARCHIVED','2019-12-07 12:57:23',0),
 ('2019_12_15_00_auth.sql','62CFB68A53F73E875B1104F0D0BAC81145090524','ARCHIVED','2019-12-15 18:26:21',0),
-('2020_01_15_00_auth.sql','D486C0CEF68FDE5122E835128A1F663E0E72A21E','ARCHIVED','2020-01-15 07:45:18',0);
+('2020_01_15_00_auth.sql','D486C0CEF68FDE5122E835128A1F663E0E72A21E','ARCHIVED','2020-01-15 07:45:18',0),
+('2020_02_15_00_auth.sql','9CDBEBC722BEBB7C93091CF16EEB9C922C4116BD','ARCHIVED','2020-02-15 17:36:05',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2057,4 +2058,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-01-15  7:45:19
+-- Dump completed on 2020-02-15 17:36:06
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 80a0a678104..063430cf421 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2641,7 +2641,8 @@ INSERT INTO `updates` VALUES
 ('2019_10_18_00_characters.sql','143669FB0AA803C7287A4FF4ABE85F45F63369E5','ARCHIVED','2019-10-18 08:37:37',0),
 ('2019_11_16_00_characters.sql','F29BBE2869E2187B278B27236A3D156B849F0E43','ARCHIVED','2019-11-16 12:06:06',0),
 ('2019_12_15_00_characters.sql','2EE449B59D56F884796B5D43C89B7C73DBF53939','ARCHIVED','2019-12-15 18:26:21',0),
-('2020_01_15_00_characters.sql','CCA31041B25FC4BD631D07BB2E42B3C8F32465F0','ARCHIVED','2020-01-15 07:45:18',0);
+('2020_01_15_00_characters.sql','CCA31041B25FC4BD631D07BB2E42B3C8F32465F0','ARCHIVED','2020-01-15 07:45:18',0),
+('2020_02_15_00_characters.sql','645EDA60CDD479B3D1E78D2D89DAB5D6EA1FB7BC','ARCHIVED','2020-02-15 17:36:05',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2808,4 +2809,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-15  7:45:20
+-- Dump completed on 2020-02-15 17:36:06
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index a99895c7c28..cafd81daf8d 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -222,18 +222,18 @@ DROP TABLE IF EXISTS `broadcast_text`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `broadcast_text` (
   `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Language` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `MaleText` longtext,
-  `FemaleText` longtext,
-  `EmoteID0` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `LanguageID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Text` longtext,
+  `Text1` longtext,
   `EmoteID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `EmoteID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `EmoteDelay0` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `EmoteID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `EmoteDelay1` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `EmoteDelay2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `SoundId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Unk1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Unk2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `SoundEntriesID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `EmotesID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -249,8 +249,8 @@ DROP TABLE IF EXISTS `broadcast_text_locale`;
 CREATE TABLE `broadcast_text_locale` (
   `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
-  `MaleText` text,
-  `FemaleText` text,
+  `Text` text,
+  `Text1` text,
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1455,7 +1455,7 @@ CREATE TABLE `holiday_dates` (
   `id` int(10) unsigned NOT NULL,
   `date_id` tinyint(3) unsigned NOT NULL,
   `date_value` int(10) unsigned NOT NULL,
-  `holiday_duration` int(10) unsigned NOT NULL,
+  `holiday_duration` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`,`date_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1889,89 +1889,89 @@ CREATE TABLE `npc_text` (
   `BroadcastTextID0` mediumint(6) NOT NULL DEFAULT '0',
   `lang0` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Probability0` float NOT NULL DEFAULT '0',
-  `em0_0` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em0_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em0_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em0_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em0_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em0_5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay0_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote0_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay0_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote0_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay0_2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote0_2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text1_0` longtext,
   `text1_1` longtext,
   `BroadcastTextID1` mediumint(6) NOT NULL DEFAULT '0',
   `lang1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Probability1` float NOT NULL DEFAULT '0',
-  `em1_0` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em1_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em1_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em1_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em1_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em1_5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay1_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote1_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay1_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote1_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay1_2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote1_2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text2_0` longtext,
   `text2_1` longtext,
   `BroadcastTextID2` mediumint(6) NOT NULL DEFAULT '0',
   `lang2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Probability2` float NOT NULL DEFAULT '0',
-  `em2_0` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em2_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em2_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em2_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em2_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em2_5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay2_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote2_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay2_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote2_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay2_2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote2_2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text3_0` longtext,
   `text3_1` longtext,
   `BroadcastTextID3` mediumint(6) NOT NULL DEFAULT '0',
   `lang3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Probability3` float NOT NULL DEFAULT '0',
-  `em3_0` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em3_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em3_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em3_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em3_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em3_5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay3_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote3_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay3_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote3_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay3_2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote3_2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text4_0` longtext,
   `text4_1` longtext,
   `BroadcastTextID4` mediumint(6) NOT NULL DEFAULT '0',
   `lang4` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Probability4` float NOT NULL DEFAULT '0',
-  `em4_0` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em4_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em4_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em4_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em4_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em4_5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay4_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote4_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay4_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote4_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay4_2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote4_2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text5_0` longtext,
   `text5_1` longtext,
   `BroadcastTextID5` mediumint(6) NOT NULL DEFAULT '0',
   `lang5` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Probability5` float NOT NULL DEFAULT '0',
-  `em5_0` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em5_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em5_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em5_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em5_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em5_5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay5_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote5_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay5_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote5_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay5_2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote5_2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text6_0` longtext,
   `text6_1` longtext,
   `BroadcastTextID6` mediumint(6) NOT NULL DEFAULT '0',
   `lang6` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Probability6` float NOT NULL DEFAULT '0',
-  `em6_0` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em6_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em6_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em6_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em6_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em6_5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay6_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote6_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay6_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote6_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay6_2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote6_2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text7_0` longtext,
   `text7_1` longtext,
   `BroadcastTextID7` mediumint(6) NOT NULL DEFAULT '0',
   `lang7` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Probability7` float NOT NULL DEFAULT '0',
-  `em7_0` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em7_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em7_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em7_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em7_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `em7_5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay7_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote7_0` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay7_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote7_1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay7_2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote7_2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3716,6 +3716,25 @@ CREATE TABLE `vehicle_accessory` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `vehicle_seat_addon`
+--
+
+DROP TABLE IF EXISTS `vehicle_seat_addon`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicle_seat_addon` (
+  `SeatEntry` int(4) unsigned NOT NULL COMMENT 'VehicleSeatEntry.dbc identifier',
+  `SeatOrientation` float DEFAULT '0' COMMENT 'Seat Orientation override value',
+  `ExitParamX` float DEFAULT '0',
+  `ExitParamY` float DEFAULT '0',
+  `ExitParamZ` float DEFAULT '0',
+  `ExitParamO` float DEFAULT '0',
+  `ExitParamValue` tinyint(1) DEFAULT '0',
+  PRIMARY KEY (`SeatEntry`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `vehicle_template_accessory`
 --
@@ -3844,4 +3863,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-15  7:45:20
+-- Dump completed on 2020-02-15 17:36:07
diff --git a/sql/updates/auth/3.3.5/2020_01_15_00_auth.sql b/sql/old/3.3.5a/auth/20011_2020_02_15/2020_01_15_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2020_01_15_00_auth.sql
rename to sql/old/3.3.5a/auth/20011_2020_02_15/2020_01_15_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2020_01_15_00_characters.sql b/sql/old/3.3.5a/characters/20011_2020_02_15/2020_01_15_00_characters.sql
similarity index 100%
rename from sql/updates/characters/3.3.5/2020_01_15_00_characters.sql
rename to sql/old/3.3.5a/characters/20011_2020_02_15/2020_01_15_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2020_01_15_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_15_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_15_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_15_01_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_15_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_15_01_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_15_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_15_02_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_15_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_15_02_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_15_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_16_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_16_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_16_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_16_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_17_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_17_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_17_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_17_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_17_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_17_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_17_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_17_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_17_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_17_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_17_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_17_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_18_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_18_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_18_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_18_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_18_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_18_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_18_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_18_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_18_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_18_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_18_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_18_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_18_03_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_18_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_18_03_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_18_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_19_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_19_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_19_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_19_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_19_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_19_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_19_03_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_19_03_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_19_04_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_19_04_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_19_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_21_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_21_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_21_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_21_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_23_00_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_23_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_23_00_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_23_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_25_00_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_25_00_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_25_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_25_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_25_02_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_25_02_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_25_03_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_25_03_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_25_04_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_25_04_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_25_05_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_05_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_25_05_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_25_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_26_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_26_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_26_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_26_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_26_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_26_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_26_03_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_26_03_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_26_04_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_26_04_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_26_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_27_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_27_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_27_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_27_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_27_01_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_27_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_27_01_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_27_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_01_27_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_27_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_27_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_27_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_28_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_28_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_28_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_28_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_28_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_28_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_28_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_28_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_28_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_28_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_28_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_28_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_28_03_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_28_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_28_03_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_28_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_01_30_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_01_30_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_01_30_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_01_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_01_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_01_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_01_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_01_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_01_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_01_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_01_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_01_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_01_02_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_01_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_01_02_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_01_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_02_01_03_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_01_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_01_03_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_01_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_08_00_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_08_00_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_02_08_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_08_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_08_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_08_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_08_03_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_08_03_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_02_08_04_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_08_04_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_08_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_10_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_10_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_10_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_10_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_11_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_11_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_11_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_11_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_11_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_11_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_11_03_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_11_03_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_11_04_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_11_04_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_11_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_13_00_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_13_00_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_13_01_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_13_01_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_13_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_13_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_13_03_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_13_03_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_13_04_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_13_04_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_02_13_05_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_05_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_13_05_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_13_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_02_14_00_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_14_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_14_00_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_14_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_02_14_01_world_335.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_14_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_14_01_world_335.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_14_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_02_14_02_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_14_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_14_02_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_14_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_02_14_03_world.sql b/sql/old/3.3.5a/world/20011_2020_02_15/2020_02_14_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_02_14_03_world.sql
rename to sql/old/3.3.5a/world/20011_2020_02_15/2020_02_14_03_world.sql
diff --git a/sql/updates/auth/3.3.5/2020_02_15_00_auth.sql b/sql/updates/auth/3.3.5/2020_02_15_00_auth.sql
new file mode 100644
index 00000000000..f4fd84024f0
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2020_02_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20021 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2020_02_15_00_characters.sql b/sql/updates/characters/3.3.5/2020_02_15_00_characters.sql
new file mode 100644
index 00000000000..d9b37cb4c4c
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2020_02_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20021 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2020_02_15_00_world.sql b/sql/updates/world/3.3.5/2020_02_15_00_world.sql
new file mode 100644
index 00000000000..c0a41c363ce
--- /dev/null
+++ b/sql/updates/world/3.3.5/2020_02_15_00_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.20021 world
+UPDATE `version` SET `db_version`='TDB 335.20021', `cache_id`=20021 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';