diff --git a/sql/updates/hotfixes/master/2021_01_02_00_hotfixes.sql b/sql/updates/hotfixes/master/2021_01_02_00_hotfixes.sql
new file mode 100644
index 000000000..f41aaa42e
--- /dev/null
+++ b/sql/updates/hotfixes/master/2021_01_02_00_hotfixes.sql
@@ -0,0 +1,42 @@
+--
+-- Table structure for table `map_difficulty_x_condition`
+--
+DROP TABLE IF EXISTS `map_difficulty_x_condition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `map_difficulty_x_condition` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FailureDescription` text,
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` int(11) NOT NULL DEFAULT '0',
+  `MapDifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `map_difficulty_x_condition_locale`
+--
+DROP TABLE IF EXISTS `map_difficulty_x_condition_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `map_difficulty_x_condition_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `FailureDescription_lang` text,
+  `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+/*!50500 PARTITION BY LIST  COLUMNS(locale)
+(PARTITION deDE VALUES IN ('deDE') ENGINE = InnoDB,
+ PARTITION esES VALUES IN ('esES') ENGINE = InnoDB,
+ PARTITION esMX VALUES IN ('esMX') ENGINE = InnoDB,
+ PARTITION frFR VALUES IN ('frFR') ENGINE = InnoDB,
+ PARTITION itIT VALUES IN ('itIT') ENGINE = InnoDB,
+ PARTITION koKR VALUES IN ('koKR') ENGINE = InnoDB,
+ PARTITION ptBR VALUES IN ('ptBR') ENGINE = InnoDB,
+ PARTITION ruRU VALUES IN ('ruRU') ENGINE = InnoDB,
+ PARTITION zhCN VALUES IN ('zhCN') ENGINE = InnoDB,
+ PARTITION zhTW VALUES IN ('zhTW') ENGINE = InnoDB) */;
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/sql/updates/world/master/2020_11_01_00_world_2017_10_05_03_world.sql b/sql/updates/world/master/2020_11_01_00_world_2017_10_05_03_world.sql
new file mode 100644
index 000000000..e0d9f683b
--- /dev/null
+++ b/sql/updates/world/master/2020_11_01_00_world_2017_10_05_03_world.sql
@@ -0,0 +1,44 @@
+-- Add waypoints and script of Lieutenant Tomathren and Ranger Valanna
+SET @GUID_1 := 82035; -- Lieutenant Tomathren
+SET @ENTRY_1 := 16217;
+SET @ENTRY_1_A := @ENTRY_1 * 100;
+SET @ENTRY_2 := 16219; -- Ranger Valanna
+SET @PATHID := @GUID_1 * 10;
+
+UPDATE `creature` SET `position_x`=7935.186, `position_y`=-7572.151, `position_z`=145.281, `orientation`=2.8516, `MovementType`=2 WHERE `guid`=@GUID_1;
+DELETE FROM `creature_addon` WHERE `guid`=@GUID_1;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes2`) VALUES (@GUID_1, @PATHID, 4098);
+DELETE FROM `waypoint_data` WHERE `id`=@PATHID;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES 
+(@PATHID, 1, 7934.20, -7571.73, 145.426),
+(@PATHID, 2, 7932.95, -7570.95, 145.614),
+(@PATHID, 3, 7932.98, -7569.02, 145.620),
+(@PATHID, 4, 7934.05, -7566.79, 145.608),
+(@PATHID, 5, 7936.55, -7565.71, 145.534),
+(@PATHID, 6, 7938.52, -7566.83, 145.492),
+(@PATHID, 7, 7938.93, -7570.77, 144.967),
+(@PATHID, 8, 7936.23, -7572.49, 145.117);
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (@ENTRY_1, @ENTRY_2);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Probability`, `BroadcastTextId`, `comment`) VALUES
+(@ENTRY_1, 0, 0, "Take that!", 12, 100, 12544, "Lieutenant Tomathren - Out of combat"),
+(@ENTRY_1, 0, 1, "This isnt Silvermoon City! Where are we? Oh, I was confused there for a moment.", 12, 100, 12542, "Lieutenant Tomathren - Out of combat"),
+(@ENTRY_1, 0, 2, "I tell you now, when we get back to Farstrider Enclave there will be a full accounting of your actions, Ranger Valanna! You alone were responsible for our losses and Im certain that the captain will see it my way.", 12, 100, 12543, "Lieutenant Tomathren - Out of combat"),
+(@ENTRY_1, 0, 3, "Im sure to receive a commendation upon our return. We may have suffered a few losses, but overall I think we did quite nicely, dont you, Valanna?", 12, 100, 12545, "Lieutenant Tomathren - Out of combat"),
+(@ENTRY_1, 0, 4, "Did I not yell at them? Pull back! Pull back and regroup with suppressing fire!!", 12, 100, 12541, "Lieutenant Tomathren - Out of combat"),
+(@ENTRY_1, 0, 5, "They should have listened to me.  Then Id receive all of the accolades that are my due!", 12, 100, 12540, "Lieutenant Tomathren - Out of combat"),
+(@ENTRY_2, 0, 0, "You have got to be the most incompetent officer I have ever met!", 12, 100, 22242, "Ranger Valanna - Out of combat"),
+(@ENTRY_2, 0, 1, "Remind me once again why it is that I dont just leave?", 12, 100, 22241, "Ranger Valanna - Out of combat"),
+(@ENTRY_2, 0, 2, "Uh huh.  Whatever you say.", 12, 100, 22238, "Ranger Valanna - Out of combat"),
+(@ENTRY_2, 0, 3, "Idiot.", 12, 100, 22239, "Ranger Valanna - Out of combat"),
+(@ENTRY_2, 0, 4, "Would you please shut up?!", 12, 100, 22240, "Ranger Valanna - Out of combat"),
+(@ENTRY_2, 0, 5, "With all due respect, sir, stick it!", 12, 100, 22243, "Ranger Valanna - Out of combat");
+
+-- Lieutenant Tomathren SAI + Actionlist
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY_1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY_1) AND `source_type` IN (0);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1621700) AND `source_type` IN (9);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(16217, 0, 0, 0, 1, 0, 100, 0, 2000, 20000, 120000, 180000, 80, 1621700, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Lieutenant Tomathren - Out Of Combat - Call Actionlist"),
+(1621700, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Lieutenant Tomathren - On Script - Talk 0"),
+(1621700, 9, 1, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 16219, 0, 0, 0, 0, 0, 0, "Lieutenant Tomathren - On Script - Talk 0 (Ranger Valanna)");
diff --git a/sql/updates/world/master/2020_11_01_01_world_2017_10_05_04_world.sql b/sql/updates/world/master/2020_11_01_01_world_2017_10_05_04_world.sql
new file mode 100644
index 000000000..93d60c3ac
--- /dev/null
+++ b/sql/updates/world/master/2020_11_01_01_world_2017_10_05_04_world.sql
@@ -0,0 +1,9 @@
+-- Update Tempers gossip to show different texts depending on class
+DELETE FROM `gossip_menu` WHERE `MenuID`=7378 AND `TextID`=8830;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES 
+(7378, 8830);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7378;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(14, 7378, 8832, 0, 0, 15, 0, 64, 0, 0, 0, 0, 0, "", "Show gossip text if class is shaman"), 
+(14, 7378, 8830, 0, 0, 15, 0, 64, 0, 0, 1, 0, 0, "", "Show gossip text if class isn't shaman");
diff --git a/sql/updates/world/master/2020_11_01_02_world_2017_10_05_06_world.sql b/sql/updates/world/master/2020_11_01_02_world_2017_10_05_06_world.sql
new file mode 100644
index 000000000..ef799ba69
--- /dev/null
+++ b/sql/updates/world/master/2020_11_01_02_world_2017_10_05_06_world.sql
@@ -0,0 +1,2 @@
+-- Item - Icecrown Reputation Ring Healer Trigger, spell should proc on cast
+UPDATE `spell_proc` SET `SpellPhaseMask`=1 WHERE `SpellId`=72419;
diff --git a/sql/updates/world/master/2020_11_01_03_world_2017_10_06_01_world.sql b/sql/updates/world/master/2020_11_01_03_world_2017_10_06_01_world.sql
new file mode 100644
index 000000000..b19a8acbf
--- /dev/null
+++ b/sql/updates/world/master/2020_11_01_03_world_2017_10_06_01_world.sql
@@ -0,0 +1,22 @@
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) AND `SourceEntry`IN(12451,12161,12425, 11175,11406,12182,12189,11573,11995,12469,12542,11996,12511,12208,12210);
+
+
+
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19, 0, 11175, 0, 0, 14, 0, 11176, 0, 0, 0, 0, 0, '', 'My Daughter is optional BreadCrumb Quest'),
+(19, 0, 11406, 0, 0, 14, 0, 11269, 0, 0, 0, 0, 0, '', 'Everything Must Be Ready is optional BreadCrumb Quest'),
+(19, 0, 12182, 0, 0, 14, 0, 12188, 0, 0, 0, 0, 0, '', 'To Venomspite! is optional BreadCrumb Quest'),
+(19, 0, 12189, 0, 0, 14, 0, 12188, 0, 0, 0, 0, 0, '', 'Imbeciles Abound! is optional BreadCrumb Quest'),
+(19, 0, 11573, 0, 0, 14, 0, 11504, 0, 0, 0, 0, 0, '', 'Orfus of Kamagua is optional BreadCrumb Quest'),
+(19, 0, 11995, 0, 0, 14, 0, 12000, 0, 0, 0, 0, 0, '', 'Your Presence is Required at Stars'' Rest is optional BreadCrumb Quest'),
+(19, 0, 12469, 0, 0, 14, 0, 12044, 0, 0, 0, 0, 0, '', 'Return to Sender is optional BreadCrumb Quest'),
+(19, 0, 12542, 0, 0, 14, 0, 12545, 0, 0, 0, 0, 0, '', 'The Call Of The Crusade is optional BreadCrumb Quest'),
+(19, 0, 11996, 0, 0, 14, 0, 11999, 0, 0, 0, 0, 0, '', 'Your Presence is Required at Agmar''s Hammer is optional BreadCrumb Quest'),
+(19, 0, 12511, 0, 0, 14, 0, 12292, 0, 0, 0, 0, 0, '', 'The Hills Have Us is optional BreadCrumb Quest'),
+(19, 0, 12208, 0, 0, 14, 0, 11984, 0, 0, 0, 0, 0, '', 'Good Troll Hunting is optional BreadCrumb Quest'),
+(19, 0, 12210, 0, 0, 14, 0, 11984, 0, 0, 0, 0, 0, '', 'Troll Season! is optional BreadCrumb Quest'),
+(19, 0, 12451, 0, 0, 14, 0, 12195, 0, 0, 0, 0, 0, '', 'Onward to Camp Oneqwah is optional BreadCrumb Quest'),
+(19, 0, 12161, 0, 0, 14, 0, 12328, 0, 0, 0, 0, 0, '', 'Ruuna the Blind is optional BreadCrumb Quest'),
+(19, 0, 12425, 0, 0, 14, 0, 12328, 0, 0, 0, 0, 0, '', 'Ruuna the Blind is optional BreadCrumb Quest');
+
diff --git a/sql/updates/world/master/2020_11_01_04_world_2017_10_09_00_world.sql b/sql/updates/world/master/2020_11_01_04_world_2017_10_09_00_world.sql
new file mode 100644
index 000000000..2854829fd
--- /dev/null
+++ b/sql/updates/world/master/2020_11_01_04_world_2017_10_09_00_world.sql
@@ -0,0 +1,11 @@
+-- Thrallmar: Report to Nazgrel (10875)
+UPDATE `quest_offer_reward` SET `RewardText`= "It is good to hear of all your moves against the fel orcs, $N.  The apothecaries have spent much time and resources studying the cause of their corruption, and although such information is invaluable... my orc blood burns to strike a severe blow against these betrayers!$b$bListen close, and I will explain my task..." WHERE `ID`=10875;
+
+-- Shadowmoon Village: Chief Apothecary Hildagard, Spectrecles (10625)
+UPDATE `quest_offer_reward` SET `RewardText`="Gorefiend? T... Teron Gorefiend? But... How?$b$bHow could Gorefiend be here? This is impossible!$b$bThe legend of Teron Gorefiend is one that causes even the Forsaken to tremble in fear. By all accounts, Gorefiend was a warlock of Gul'dan - extremely powerful in his own right. When Gorefiend was slain by Orgrim Doomhammer, Gul'dan took the soul of the fallen warlock and placed it inside the broken shell of a slain knight of Stormwind. And so was born the first death knight of the Horde." WHERE `ID`=10625;
+
+-- Researcher Tiorus, Felspine the Greater (10673)
+UPDATE `quest_request_items` SET `CompletionText`="Snap to it! That gnome's appetite knows no limit!" WHERE `ID`=10673;
+
+-- Before Darkness Falls (10878)
+UPDATE `quest_offer_reward` SET `RewardText`="I can breathe a sigh of relief for now, $N.  The Shadow Council will be held off for the time being.$b$bThey are murderers and cowards and your display of courage will keep them at bay." WHERE `ID`=10878;
diff --git a/sql/updates/world/master/2020_11_01_05_world_2017_10_10_02_world.sql b/sql/updates/world/master/2020_11_01_05_world_2017_10_10_02_world.sql
new file mode 100644
index 000000000..0e6a88f3a
--- /dev/null
+++ b/sql/updates/world/master/2020_11_01_05_world_2017_10_10_02_world.sql
@@ -0,0 +1,92 @@
+-- Dawnstart Spire overhaul
+SET @GUID_1 := 81865; -- Arcane Reaver #1
+SET @GUID_2 := 81867; -- Arcane Reaver #2
+SET @GUID_3 := 81869; -- Arcane Reaver #3
+SET @GUID_4 := 81860; -- Arcane Reaver #4
+SET @PATHID_1 := @GUID_1 * 10;
+SET @PATHID_2 := @GUID_2 * 10;
+SET @PATHID_3 := @GUID_3 * 10;
+SET @PATHID_4 := @GUID_4 * 10;
+
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid` IN (81863, 81861, 81859, 81858);
+UPDATE `creature` SET `position_x`=7818.52, `position_y`=-7875.30, `position_z`=167.145, `orientation`=1.7218, `spawndist`=0, `MovementType`=0 WHERE `guid`=81938;
+UPDATE `creature` SET `position_x`=7830.56, `position_y`=-7877.31, `position_z`=169.147, `orientation`=4.6435, `spawndist`=0, `MovementType`=2 WHERE `guid`=@GUID_1;
+UPDATE `creature` SET `position_x`=7830.46, `position_y`=-7883.70, `position_z`=169.238, `orientation`=4.6435, `spawndist`=0, `MovementType`=2 WHERE `guid`=@GUID_2;
+UPDATE `creature` SET `position_x`=7788.29, `position_y`=-7866.93, `position_z`=167.249, `orientation`=1.6346, `spawndist`=0, `MovementType`=2 WHERE `guid`=@GUID_3;
+UPDATE `creature` SET `position_x`=7866.38, `position_y`=-7865.52, `position_z`=169.709, `orientation`=1.7868, `spawndist`=0, `MovementType`=2 WHERE `guid`=@GUID_4;
+
+DELETE FROM `creature` WHERE `guid` IN (81868, 81862);
+
+DELETE FROM `creature_addon` WHERE `guid` IN (@GUID_1, @GUID_2, @GUID_3, @GUID_4);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes2`) VALUES 
+(@GUID_1, @PATHID_1, 4097),
+(@GUID_2, @PATHID_2, 4097),
+(@GUID_3, @PATHID_3, 4097),
+(@GUID_4, @PATHID_4, 4097);
+
+DELETE FROM `waypoint_data` WHERE `id` IN (@PATHID_1, @PATHID_2, @PATHID_3, @PATHID_4);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES
+(@PATHID_1, 1, 7830.25, -7906.69, 169.243),
+(@PATHID_1, 2, 7826.57, -7907.71, 169.240),
+(@PATHID_1, 3, 7824.40, -7911.16, 169.240),
+(@PATHID_1, 4, 7808.62, -7917.26, 169.244),
+(@PATHID_1, 5, 7812.92, -7927.34, 170.889),
+(@PATHID_1, 6, 7821.23, -7932.56, 173.071),
+(@PATHID_1, 7, 7830.24, -7934.47, 175.291),
+(@PATHID_1, 8, 7838.78, -7932.69, 177.055),
+(@PATHID_1, 9, 7847.03, -7928.16, 178.839),
+(@PATHID_1, 10, 7851.27, -7920.12, 180.428),
+(@PATHID_1, 11, 7854.10, -7911.47, 180.429),
+(@PATHID_1, 12, 7867.72, -7911.44, 180.715),
+(@PATHID_1, 13, 7878.59, -7911.82, 182.803),
+(@PATHID_1, 14, 7867.72, -7911.44, 180.715),
+(@PATHID_1, 15, 7854.10, -7911.47, 180.429),
+(@PATHID_1, 16, 7851.27, -7920.12, 180.428),
+(@PATHID_1, 17, 7847.03, -7928.16, 178.839),
+(@PATHID_1, 18, 7838.78, -7932.69, 177.055),
+(@PATHID_1, 19, 7830.24, -7934.47, 175.291),
+(@PATHID_1, 20, 7821.23, -7932.56, 173.071),
+(@PATHID_1, 21, 7812.92, -7927.34, 170.889),
+(@PATHID_1, 22, 7808.62, -7917.26, 169.244),
+(@PATHID_1, 23, 7824.40, -7911.16, 169.240),
+(@PATHID_1, 24, 7826.57, -7907.71, 169.240),
+(@PATHID_1, 25, 7830.25, -7906.69, 169.243),
+(@PATHID_1, 26, 7830.56, -7877.31, 169.147),
+(@PATHID_2, 1, 7830.90, -7842.99, 169.391),
+(@PATHID_2, 2, 7846.70, -7841.67, 170.134),
+(@PATHID_2, 3, 7846.84, -7824.87, 170.581),
+(@PATHID_2, 4, 7835.30, -7817.69, 170.466),
+(@PATHID_2, 5, 7800.81, -7815.93, 170.603),
+(@PATHID_2, 6, 7795.67, -7818.42, 170.734),
+(@PATHID_2, 7, 7794.67, -7834.75, 169.453),
+(@PATHID_2, 8, 7808.46, -7840.24, 168.951),
+(@PATHID_2, 9, 7821.20, -7833.64, 170.003),
+(@PATHID_2, 10, 7827.38, -7834.57, 170.058),
+(@PATHID_2, 11, 7830.90, -7842.99, 169.391),
+(@PATHID_2, 12, 7830.46, -7883.70, 169.238),
+(@PATHID_2, 13, 7830.90, -7842.99, 169.391),
+(@PATHID_2, 14, 7827.38, -7834.57, 170.058),
+(@PATHID_2, 15, 7821.20, -7833.64, 170.003),
+(@PATHID_2, 16, 7808.46, -7840.24, 168.951),
+(@PATHID_2, 17, 7794.67, -7834.75, 169.453),
+(@PATHID_2, 18, 7795.67, -7818.42, 170.734),
+(@PATHID_2, 19, 7800.81, -7815.93, 170.603),
+(@PATHID_2, 20, 7835.30, -7817.69, 170.466),
+(@PATHID_2, 21, 7846.84, -7824.87, 170.581),
+(@PATHID_2, 22, 7846.70, -7841.67, 170.134),
+(@PATHID_2, 23, 7830.90, -7842.99, 169.391),
+(@PATHID_2, 24, 7830.46, -7883.70, 169.238),
+(@PATHID_3, 1, 7785.77, -7833.79, 170.696),
+(@PATHID_3, 2, 7788.42, -7818.38, 171.033),
+(@PATHID_3, 3, 7785.77, -7833.79, 170.696),
+(@PATHID_3, 4, 7788.29, -7866.93, 167.249),
+(@PATHID_3, 5, 7791.01, -7896.47, 166.752),
+(@PATHID_3, 6, 7792.55, -7906.87, 167.080),
+(@PATHID_3, 7, 7791.01, -7896.47, 166.752),
+(@PATHID_3, 8, 7788.29, -7866.93, 167.249),
+(@PATHID_4, 1, 7857.40, -7825.82, 170.856),
+(@PATHID_4, 2, 7866.38, -7865.52, 169.704),
+(@PATHID_4, 3, 7870.51, -7891.75, 167.853),
+(@PATHID_4, 4, 7870.07, -7903.79, 167.394),
+(@PATHID_4, 5, 7870.51, -7891.75, 167.852),
+(@PATHID_4, 6, 7866.38, -7865.52, 169.703);
diff --git a/sql/updates/world/master/2020_11_01_06_world_2017_10_10_03_world.sql b/sql/updates/world/master/2020_11_01_06_world_2017_10_10_03_world.sql
new file mode 100644
index 000000000..af8d10b98
--- /dev/null
+++ b/sql/updates/world/master/2020_11_01_06_world_2017_10_10_03_world.sql
@@ -0,0 +1,50 @@
+-- Add waypoints, formation and condition of Drak'aguul
+SET @GUID := 99649;
+SET @PATHID := @GUID * 10;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=52457;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `comment`) VALUES 
+(13, 1, 52457, 0, 1, 31, 0, 3, 26797, 0, 0, 0, 0, "Spell 'Drak'aguul's Soldiers' only hits Drakkari Protector"),
+(13, 1, 52457, 0, 2, 31, 0, 3, 26795, 0, 0, 0, 0, "Spell 'Drak'aguul's Soldiers' only hits Drakkari Oracle");
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=@GUID;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(@GUID, @GUID, 4, 0, 515),
+(@GUID, 112163, 4, 45, 515),
+(@GUID, 112352, 4, 315, 515);
+
+UPDATE `creature_addon` SET `path_id`=@PATHID WHERE `guid`=@GUID;
+UPDATE `creature` SET `spawndist`=0, `MovementType`=2 WHERE `guid` IN (@GUID);
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid` IN (112163, 112352);
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATHID;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES
+(@PATHID, 1, 4475.12, -4909.09, 15.846),
+(@PATHID, 2, 4476.58, -4895.84, 23.675),
+(@PATHID, 3, 4476.62, -4889.59, 25.291),
+(@PATHID, 4, 4474.50, -4880.82, 25.309),
+(@PATHID, 5, 4474.56, -4865.42, 25.309),
+(@PATHID, 6, 4474.50, -4880.82, 25.309),
+(@PATHID, 7, 4476.62, -4889.59, 25.291),
+(@PATHID, 8, 4476.58, -4895.84, 23.675),
+(@PATHID, 9, 4475.12, -4909.09, 15.846),
+(@PATHID, 10, 4474.54, -4923.89, 14.257),
+(@PATHID, 11, 4475.81, -4938.72, 14.205),
+(@PATHID, 12, 4475.48, -4955.87, 14.043),
+(@PATHID, 13, 4475.82, -4966.02, 10.969),
+(@PATHID, 14, 4475.77, -4976.62, 11.276),
+(@PATHID, 15, 4475.82, -4966.02, 10.969),
+(@PATHID, 16, 4475.48, -4955.87, 14.043),
+(@PATHID, 17, 4475.81, -4938.72, 14.205),
+(@PATHID, 18, 4474.54, -4923.89, 14.257);
+
+-- Remove old SAI and weapon of Drakkari Oracle 
+SET @ENTRY := 26795;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,0,0,0,3500,5000,11,9532,64,0,0,0,0,2,0,0,0,0,0,0,0,"Drakkari Oracle - In Combat CMC - Cast 'Lightning Bolt'"),
+(@ENTRY,0,1,0,0,0,100,0,6000,8000,12000,16000,11,52431,32,0,0,0,0,5,0,0,0,0,0,0,0,"Drakkari Oracle - In Combat  - Cast 'Warped Body'"),
+(@ENTRY,0,2,0,0,0,100,0,8000,10000,12000,16000,11,52430,32,0,0,0,0,5,0,0,0,0,0,0,0,"Drakkari Oracle - In Combat  - Cast 'Warped Mind'");
+
+DELETE FROM `creature_equip_template` WHERE `CreatureID`=@ENTRY;
+UPDATE `creature` SET `equipment_id`=0 WHERE `id`=@ENTRY;
diff --git a/sql/updates/world/master/2020_11_01_07_world_2017_10_10_12_world.sql b/sql/updates/world/master/2020_11_01_07_world_2017_10_10_12_world.sql
new file mode 100644
index 000000000..9f2586127
--- /dev/null
+++ b/sql/updates/world/master/2020_11_01_07_world_2017_10_10_12_world.sql
@@ -0,0 +1,433 @@
+-- 
+SET @cguid:=146981;
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+53;
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `PhaseId`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES
+(@CGUID+0, 25419, 571, 0, 0, '0', 0, 0, 0, 4419.61, 5952.447, 57.03477, 1.121153, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: -1)
+(@CGUID+1, 25419, 571, 0, 0, '0', 0, 0, 0, 4448.788, 5916.716, 57.72005, 5.721869, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: -1)
+(@CGUID+2, 25419, 571, 0, 0, '0', 0, 0, 0, 4448.035, 5957.813, 57.98078, 1.14177, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: -1)
+(@CGUID+3, 25419, 571, 0, 0, '0', 0, 0, 0, 4461.483, 5886.482, 61.893, 3.48094, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: -1)
+(@CGUID+4, 25419, 571, 0, 0, '0', 0, 0, 0, 4413.073, 5904.856, 56.37568, 4.019106, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: -1)
+(@CGUID+5, 25419, 571, 0, 0, '0', 0, 0, 0, 4382.702, 5905.957, 55.72123, 2.909203, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: -1)
+(@CGUID+6, 25419, 571, 0, 0, '0', 0, 0, 0, 4421.654, 5896.283, 55.94137, 4.782922, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: -1)
+(@CGUID+7, 25419, 571, 0, 0, '0', 0, 0, 0, 4348.286, 5917.032, 60.72934, 5.387158, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+8, 25419, 571, 0, 0, '0', 0, 0, 0, 4451.888, 5851.77, 69.95783, 6.034452, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+9, 25417, 571, 0, 0, '0', 0, 0, 0, 4393.225, 5881.099, 55.97466, 4.578428, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+10, 25419, 571, 0, 0, '0', 0, 0, 0, 4386.144, 5881.497, 55.75355, 3.575644, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+11, 25419, 571, 0, 0, '0', 0, 0, 0, 4384.099, 5850.214, 69.215, 0.3004377, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+12, 25419, 571, 0, 0, '0', 0, 0, 0, 4320.845, 5906.834, 57.5699, 5.094295, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+13, 25419, 571, 0, 0, '0', 0, 0, 0, 4343.608, 5851.565, 56.67913, 1.960553, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+14, 25417, 571, 0, 0, '0', 0, 0, 0, 4313.515, 5889.598, 56.97303, 0.8698314, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+15, 25419, 571, 0, 0, '0', 0, 0, 0, 4344.71, 5882.019, 56.23266, 5.41927, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+16, 25419, 571, 0, 0, '0', 0, 0, 0, 4315.075, 5880.785, 56.03077, 1.569275, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+17, 25419, 571, 0, 0, '0', 0, 0, 0, 4284.087, 5915.679, 57.39619, 2.622871, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+18, 25419, 571, 0, 0, '0', 0, 0, 0, 4386.544, 5815.437, 71.95725, 5.795134, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+19, 25419, 571, 0, 0, '0', 0, 0, 0, 4315.096, 5840.36, 58.56625, 5.083281, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+20, 25419, 571, 0, 0, '0', 0, 0, 0, 4285.949, 5883.651, 58.90496, 0.1985445, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+21, 25417, 571, 0, 0, '0', 0, 0, 0, 4417.659, 5814.049, 73.62916, 2.305409, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+22, 25419, 571, 0, 0, '0', 0, 0, 0, 4347.293, 5797.105, 70.4449, 3.9803, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+23, 25417, 571, 0, 0, '0', 0, 0, 0, 4287.359, 5808.424, 65.015, 1.333162, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+24, 25419, 571, 0, 0, '0', 0, 0, 0, 4315.808, 5817.751, 63.17729, 1.716837, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+25, 25419, 571, 0, 0, '0', 0, 0, 0, 4295.346, 5844.404, 59.16083, 5.644846, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+26, 25417, 571, 0, 0, '0', 0, 0, 0, 4313.68, 5790.48, 68.38795, 3.758053, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+27, 25417, 571, 0, 0, '0', 0, 0, 0, 4306.196, 5755.188, 74.17075, 0.4614642, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+28, 25417, 571, 0, 0, '0', 0, 0, 0, 4285.329, 5785.763, 69.6144, 6.263107, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+29, 25417, 571, 0, 0, '0', 0, 0, 0, 4380.976, 5786.691, 76.09017, 5.706718, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+30, 25417, 571, 0, 0, '0', 0, 0, 0, 4345.296, 5780.17, 74.79289, 2.769791, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+31, 25417, 571, 0, 0, '0', 0, 0, 0, 4380.676, 5750.541, 81.36572, 2.86511, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+32, 25417, 571, 0, 0, '0', 0, 0, 0, 4277.169, 5757.782, 68.8129, 0.09976582, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+33, 25417, 571, 0, 0, '0', 0, 0, 0, 4350.86, 5749.646, 82.05293, 4.125741, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+34, 25419, 571, 0, 0, '0', 0, 0, 0, 4411.514, 5790.069, 76.78316, 3.849571, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25419 (Area: 4134)
+(@CGUID+35, 25417, 571, 0, 0, '0', 0, 0, 0, 4413.009, 5788.343, 77.10886, 5.096886, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+36, 25417, 571, 0, 0, '0', 0, 0, 0, 4351.502, 5714.72, 86.44733, 4.789735, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+37, 25417, 571, 0, 0, '0', 0, 0, 0, 4373.826, 5713.223, 85.16576, 3.343639, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4134)
+(@CGUID+38, 25417, 571, 0, 0, '0', 0, 0, 0, 4317.503, 5711.320, 89.224, 4.042527, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+39, 25417, 571, 0, 0, '0', 0, 0, 0, 4250.292, 5746.842, 66.42384, 1.142227, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+40, 25417, 571, 0, 0, '0', 0, 0, 0, 4309.887, 5676.108, 92.774, 5.29737, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+41, 25417, 571, 0, 0, '0', 0, 0, 0, 4315.956, 5653.785, 94.06521, 3.442963, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+42, 25417, 571, 0, 0, '0', 0, 0, 0, 4255.53, 5709.95, 56.70618, 2.291923, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+43, 25417, 571, 0, 0, '0', 0, 0, 0, 4242.124, 5780.734, 66.33765, 3.578308, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+44, 25417, 571, 0, 0, '0', 0, 0, 0, 4218.904, 5751.581, 65.40733, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+45, 25419, 571, 0, 0, '0', 0, 0, 0, 4420.043, 5841.368, 67.582, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+-- water eles
+(@CGUID+46, 25419, 571, 0, 0, '0', 0, 0, 0, 4456.091, 5874.284, 64.093, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+47, 25419, 571, 0, 0, '0', 0, 0, 0, 4456.091, 5874.284, 64.093, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+48, 25419, 571, 0, 0, '0', 0, 0, 0, 4325.170, 5855.809, 57.569, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+49, 25419, 571, 0, 0, '0', 0, 0, 0, 4325.170, 5855.809, 57.569, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+-- fire eles
+(@CGUID+50, 25417, 571, 0, 0, '0', 0, 0, 0, 4348.101, 5731.171, 83.638, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+51, 25417, 571, 0, 0, '0', 0, 0, 0, 4348.101, 5731.171, 83.638, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+52, 25417, 571, 0, 0, '0', 0, 0, 0, 4348.101, 5731.171, 83.638, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420), -- 25417 (Area: 4133)
+(@CGUID+53, 25417, 571, 0, 0, '0', 0, 0, 0, 4348.101, 5731.171, 83.638, 1.580321, 120, 0, 0, 0, 0, 0, 0, 0, 0, 23420); -- 25417 (Area: 4133)
+
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+53;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(@CGUID+0, 0, 0, 0, 1, 0, ''), -- 25415
+(@CGUID+1, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+2, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+3, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+4, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+5, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+6, 0, 0, 0, 1, 0, ''), -- 25418
+(@CGUID+7, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+8, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+9, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+10, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+11, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+12, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+13, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+14, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+15, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+16, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+17, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+18, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+19, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+20, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+21, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+22, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+23, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+24, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+25, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+26, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+27, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+28, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+29, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+30, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+31, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+32, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+33, 0, 0, 0, 1, 0, ''), -- 31685
+(@CGUID+34, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+35, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+36, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+37, 0, 0, 0, 1, 0, ''), -- 25419
+(@CGUID+38, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+39, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+40, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+41, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+42, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+43, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+44, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+45, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+46, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+47, 0, 0, 0, 1, 0, ''), -- 25417
+(@CGUID+48, 0, 0, 0, 1, 0, ''), -- 25416
+(@CGUID+49, 0, 0, 0, 1, 0, ''), -- 24613
+(@CGUID+50, 0, 0, 0, 1, 0, ''), -- 24613
+(@CGUID+51, 0, 0, 0, 1, 0, ''), -- 24613
+(@CGUID+52, 0, 0, 0, 1, 0, ''), -- 24614
+(@CGUID+53, 0, 0, 0, 1, 0, ''); -- 31685
+
+UPDATE `creature` SET `spawntimesecs` = 300 , `spawndist` = 10 , `curhealth` = 1 , `MovementType` = 1 WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+53; 
+UPDATE `creature` SET `spawntimesecs` = 300 , `spawndist` = 4 , `curhealth` = 1 , `MovementType` = 1 WHERE `guid` = @CGUID+11; 
+
+-- delete water eles
+DELETE FROM `creature` WHERE `guid` BETWEEN 102648 AND 102652;
+DELETE FROM `creature` WHERE `guid` BETWEEN 102661 AND 102666;
+DELETE FROM `creature` WHERE `guid` IN (102645, 102626);
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN 102648 AND 102652;
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN 102661 AND 102666;
+DELETE FROM `creature_addon` WHERE `guid` IN (102645, 102626);
+
+UPDATE `creature` SET `position_x` = 4309.695 , `position_y` = 5633.367 , `position_z` = 94.87403 , `orientation` = 1.413717 WHERE `guid` = 200013; 
+
+-- air eles
+UPDATE `creature` SET `spawndist` = 10 WHERE `guid` BETWEEN 102437 AND 102442; 
+UPDATE `creature` SET `spawndist` = 10 WHERE `guid` BETWEEN 102471 AND 102485; 
+UPDATE `creature` SET `spawndist` = 10 WHERE `guid` = 102452; 
+
+-- Pathing for Enraged Tempest Entry: 25415 'TDB FORMAT' 
+SET @NPC := 102479;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4582.429,`position_y`=5916.411,`position_z`=56.099 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4582.429,5916.411,56.099,0,0,0,0,100,0), -- 20:25:05
+(@PATH,2,4567.213,5933.478,62.72065,0,0,0,0,100,0), -- 20:25:16
+(@PATH,3,4550.817,5949.297,68.55141,0,0,0,0,100,0), -- 20:25:25
+(@PATH,4,4542.173,5982.366,71.99318,0,0,0,0,100,0), -- 20:25:36
+(@PATH,5,4563.726,6018.92,78.21175,0,0,0,0,100,0), -- 20:25:51
+(@PATH,6,4586.041,6047.054,81.09695,0,0,0,0,100,0), -- 20:26:09
+(@PATH,7,4606.639,6079.772,79.38864,0,0,0,0,100,0), -- 20:26:23
+(@PATH,8,4602.986,6101.729,78.74768,0,0,0,0,100,0), -- 20:26:37
+(@PATH,9,4582.914,6126.627,81.2157,0,0,0,0,100,0), -- 20:26:49
+(@PATH,10,4556.886,6142.86,81.20538,0,0,0,0,100,0), -- 20:27:03
+(@PATH,11,4572.895,6134.833,81.22743,0,0,0,0,100,0), -- 20:27:16
+(@PATH,12,4600.353,6109.119,78.72827,0,0,0,0,100,0), -- 20:27:26
+(@PATH,13,4604.147,6095.896,79.12968,0,0,0,0,100,0), -- 20:27:39
+(@PATH,14,4600.552,6070.209,81.15663,0,0,0,0,100,0), -- 20:27:52
+(@PATH,15,4570.93,6028.483,79.49257,0,0,0,0,100,0), -- 20:28:07
+(@PATH,16,4542.822,5986.35,72.76584,0,0,0,0,100,0), -- 20:28:19
+(@PATH,17,4550.624,5951.442,69.22236,0,0,0,0,100,0), -- 20:28:38
+(@PATH,18,4564.791,5935.697,64.15934,0,0,0,0,100,0), -- 20:28:54
+(@PATH,19,4582.332,5916.214,55.95428,0,0,0,0,100,0); -- 20:29:03
+
+-- Pathing for Enraged Tempest Entry: 25415 'TDB FORMAT' 
+SET @NPC := 102473;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4497.891,`position_y`=6137.541,`position_z`=80.16054 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4497.891,6137.541,80.16054,0,0,0,0,100,0), -- 20:26:22
+(@PATH,2,4497.828,6131.405,79.64149,0,0,0,0,100,0), -- 20:26:30
+(@PATH,3,4499.488,6112.93,80.19643,0,0,0,0,100,0), -- 20:26:35
+(@PATH,4,4491.456,6088.593,78.08659,0,0,0,0,100,0), -- 20:26:45
+(@PATH,5,4505.488,6055.596,76.68158,0,0,0,0,100,0), -- 20:26:52
+(@PATH,6,4491.953,6023.114,67.60138,0,0,0,0,100,0), -- 20:27:07
+(@PATH,7,4514.078,5986.287,68.74522,0,0,0,0,100,0), -- 20:27:21
+(@PATH,8,4500.425,5965.788,63.89717,0,0,0,0,100,0), -- 20:27:39
+(@PATH,9,4503.254,5931.495,61.60934,0,0,0,0,100,0), -- 20:27:57
+(@PATH,10,4489.393,5948.091,63.07407,0,0,0,0,100,0), -- 20:28:15
+(@PATH,11,4513.931,5982.552,67.93922,0,0,0,0,100,0), -- 20:28:30
+(@PATH,12,4494.02,6016.712,67.46692,0,0,0,0,100,0), -- 20:28:48
+(@PATH,13,4501.351,6044.861,75.96799,0,0,0,0,100,0), -- 20:29:05
+(@PATH,14,4492.195,6082.638,77.78274,0,0,0,0,100,0), -- 20:29:21
+(@PATH,15,4500.411,6098.807,79.48975,0,0,0,0,100,0), -- 20:29:35
+(@PATH,16,4498.477,6122.489,79.74394,0,0,0,0,100,0), -- 20:29:41
+(@PATH,17,4497.76,6137.652,80.19916,0,0,0,0,100,0); -- 20:29:51
+
+-- paths water eles
+SET @NPC := @CGUID+46;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4456.091,`position_y`=5874.284,`position_z`=64.093 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,2,4418.135,5826.952,70.059,0,0,1,0,100,0), -- 20:26:30
+(@PATH,3,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,4,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,5,4309.625,5638.164,94.449,0,0,1,0,100,0), -- 20:26:45
+(@PATH,6,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,7,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,8,4418.135,5826.952,70.059,0,0,1,0,100,0), -- 20:26:30
+(@PATH,9,4456.091,5874.284,64.093,0,0,1,0,100,0); -- 20:26:22
+
+SET @NPC := @CGUID+47;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4408.679,`position_y`=5920.878,`position_z`=55.669 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4408.679,5920.878,55.669,0,0,1,0,100,0), -- 20:26:22
+(@PATH,2,4453.867,5900.081,59.354,0,0,1,0,100,0), -- 20:26:22
+(@PATH,3,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,4,4418.135,5826.952,70.059,0,0,1,0,100,0), -- 20:26:30
+(@PATH,5,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,6,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,7,4309.625,5638.164,94.449,0,0,1,0,100,0), -- 20:26:45
+(@PATH,8,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,9,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,10,4418.135,5826.952,70.059,0,0,1,0,100,0), -- 20:26:30
+(@PATH,11,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,12,4453.867,5900.081,59.354,0,0,1,0,100,0), -- 20:26:22
+(@PATH,13,4408.679,5920.878,55.669,0,0,1,0,100,0); -- 20:26:22
+
+SET @NPC := @CGUID+48;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4325.170,`position_y`=5855.809,`position_z`=57.569 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,2,4331.969,5789.342,70.842,0,0,1,0,100,0), -- 20:26:30
+(@PATH,3,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,4,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,5,4309.625,5638.164,94.449,0,0,1,0,100,0), -- 20:26:45
+(@PATH,6,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,7,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,8,4331.969,5789.342,70.842,0,0,1,0,100,0), -- 20:26:30
+(@PATH,9,4325.170,5855.809,57.569,0,0,1,0,100,0); -- 20:26:22
+
+SET @NPC := @CGUID+49;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4370.834,`position_y`=5889.521,`position_z`=55.853 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4370.834,5889.521,55.853,0,0,1,0,100,0), -- 20:26:22
+(@PATH,2,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,3,4331.969,5789.342,70.842,0,0,1,0,100,0), -- 20:26:30
+(@PATH,4,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,5,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,6,4309.625,5638.164,94.449,0,0,1,0,100,0), -- 20:26:45
+(@PATH,7,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,8,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,9,4331.969,5789.342,70.842,0,0,1,0,100,0), -- 20:26:30
+(@PATH,10,4325.170,5855.809,57.569,0,0,1,0,100,0); -- 20:26:22
+
+
+SET @NPC := @CGUID+34;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4400.289,`position_y`=5853.771,`position_z`=64.700 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4400.289,5853.771,64.700,0,0,1,0,100,0), -- 20:26:22
+(@PATH,2,4406.379,5794.868,75.189,0,0,1,0,100,0), -- 20:26:30
+(@PATH,3,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,4,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,5,4309.625,5638.164,94.449,0,0,1,0,100,0), -- 20:26:45
+(@PATH,6,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,7,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,8,4406.379,5794.868,75.189,0,0,1,0,100,0), -- 20:26:30
+(@PATH,9,4400.289,5853.771,64.700,0,0,1,0,100,0); -- 20:26:22
+
+SET @NPC := @CGUID+19;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4325.170,`position_y`=5855.809,`position_z`=57.569 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,2,4301.863,5794.378,67.805,0,0,1,0,100,0), -- 20:26:30
+(@PATH,3,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,4,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,5,4309.625,5638.164,94.449,0,0,1,0,100,0), -- 20:26:45
+(@PATH,6,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,7,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,8,4301.863,5794.378,67.805,0,0,1,0,100,0), -- 20:26:30
+(@PATH,9,4325.170,5855.809,57.569,0,0,1,0,100,0); -- 20:26:22
+
+-- fire eles paths
+SET @NPC := @CGUID+50;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4309.625,`position_y`=5638.164,`position_z`=94.449 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4309.625,5638.164,94.449,0,0,1,0,100,0), -- 20:26:45
+(@PATH,2,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,3,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,4,4418.135,5826.952,70.059,0,0,1,0,100,0), -- 20:26:30
+(@PATH,5,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,6,4453.867,5900.081,59.354,0,0,1,0,100,0), -- 20:26:22
+(@PATH,7,4408.679,5920.878,55.669,0,0,1,0,100,0), -- 20:26:22
+(@PATH,8,4453.867,5900.081,59.354,0,0,1,0,100,0), -- 20:26:22
+(@PATH,9,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,10,4418.135,5826.952,70.059,0,0,1,0,100,0), -- 20:26:30
+(@PATH,11,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,12,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,13,4309.625,5638.164,94.449,0,0,1,0,100,0); -- 20:26:45
+
+SET @NPC := @CGUID+51;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4347.967,`position_y`=5730.564,`position_z`=83.739 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4347.967,5730.564,83.739,0,0,1,0,100,0), -- 20:26:35
+(@PATH,2,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,3,4418.135,5826.952,70.059,0,0,1,0,100,0), -- 20:26:30
+(@PATH,4,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,5,4453.867,5900.081,59.354,0,0,1,0,100,0), -- 20:26:22
+(@PATH,6,4408.679,5920.878,55.669,0,0,1,0,100,0), -- 20:26:22
+(@PATH,7,4453.867,5900.081,59.354,0,0,1,0,100,0), -- 20:26:22
+(@PATH,8,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,9,4418.135,5826.952,70.059,0,0,1,0,100,0), -- 20:26:30
+(@PATH,10,4364.599,5757.606,80.218,0,0,1,0,100,0), -- 20:26:35
+(@PATH,11,4347.967,5730.564,83.739,0,0,1,0,100,0); -- 20:26:35
+
+SET @NPC := 102601;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4400.118,`position_y`=5793.260,`position_z`=75.037 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4400.118,5793.260,75.037,0,0,1,0,100,0), -- 20:26:35
+(@PATH,2,4400.289,5853.771,64.700,0,0,1,0,100,0), -- 20:26:22
+(@PATH,3,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,4,4453.867,5900.081,59.354,0,0,1,0,100,0), -- 20:26:22
+(@PATH,5,4391.264,5878.812,55.666,0,0,1,0,100,0), -- 20:26:22
+(@PATH,6,4356.525,5896.896,56.012,0,0,1,0,100,0), -- 20:26:22
+(@PATH,7,4391.264,5878.812,55.666,0,0,1,0,100,0), -- 20:26:22
+(@PATH,8,4453.867,5900.081,59.354,0,0,1,0,100,0), -- 20:26:22
+(@PATH,9,4456.091,5874.284,64.093,0,0,1,0,100,0), -- 20:26:22
+(@PATH,10,4400.289,5853.771,64.700,0,0,1,0,100,0), -- 20:26:22
+(@PATH,11,4400.118,5793.260,75.037,0,0,1,0,100,0); -- 20:26:35
+
+SET @NPC := @CGUID+52;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4309.625,`position_y`=5638.164,`position_z`=94.449 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4309.625,5638.164,94.449,0,0,1,0,100,0), -- 20:26:45
+(@PATH,2,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,3,4347.967,5730.564,83.739,0,0,1,0,100,0), -- 20:26:35
+(@PATH,4,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,5,4331.969,5789.342,70.842,0,0,1,0,100,0), -- 20:26:30
+(@PATH,6,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,7,4356.525,5896.896,56.012,0,0,1,0,100,0), -- 20:26:22
+(@PATH,8,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,9,4331.969,5789.342,70.842,0,0,1,0,100,0), -- 20:26:30
+(@PATH,10,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,11,4347.967,5730.564,83.739,0,0,1,0,100,0), -- 20:26:35
+(@PATH,12,4312.593,5704.205,90.690,0,0,1,0,100,0), -- 20:26:45
+(@PATH,13,4309.625,5638.164,94.449,0,0,1,0,100,0); -- 20:26:45
+
+SET @NPC := @CGUID+53;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4347.967,`position_y`=5730.564,`position_z`=83.739 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4347.967,5730.564,83.739,0,0,1,0,100,0), -- 20:26:35
+(@PATH,2,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,3,4331.969,5789.342,70.842,0,0,1,0,100,0), -- 20:26:30
+(@PATH,4,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,5,4356.525,5896.896,56.012,0,0,1,0,100,0), -- 20:26:22
+(@PATH,6,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,7,4331.969,5789.342,70.842,0,0,1,0,100,0), -- 20:26:30
+(@PATH,8,4340.155,5758.681,79.466,0,0,1,0,100,0), -- 20:26:35
+(@PATH,9,4347.967,5730.564,83.739,0,0,1,0,100,0); -- 20:26:35
+
+SET @NPC := 102600;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4319.603,`position_y`=5784.604,`position_z`=69.714 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4319.603,5784.604,69.714,0,0,1,0,100,0), -- 20:26:35
+(@PATH,2,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,3,4356.525,5896.896,56.012,0,0,1,0,100,0), -- 20:26:22
+(@PATH,4,4325.170,5855.809,57.569,0,0,1,0,100,0), -- 20:26:22
+(@PATH,5,4319.603,5784.604,69.714,0,0,1,0,100,0);
+
+-- Boiling Spirit SAI
+SET @ENTRY := 25419;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,0,3000,5000,15000,20000,11,50206,0,0,0,0,0,2,0,0,0,0,0,0,0,"Boiling Spirit - In Combat - Cast 'Scalding Steam'");
+
+-- Raging Boiler SAI
+SET @ENTRY := 25417;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,0,3000,5000,15000,20000,11,50207,0,0,0,0,0,2,0,0,0,0,0,0,0,"Raging Boiler - In Combat - Cast 'Boiling Blood'");
+
+UPDATE `creature_template` SET `DamageModifier` = 1.2 WHERE `entry` = 25417; 
+
+-- Enraged Tempest SAI
+SET @ENTRY := 25415;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,2,0,100,0,0,50,120000,120000,11,50420,0,0,0,0,0,1,0,0,0,0,0,0,0,"Enraged Tempest - Between 0-50% Health - Cast 'Enrage'"),
+(@ENTRY,0,1,0,6,0,100,0,0,0,0,0,11,50215,0,0,0,0,0,1,0,0,0,0,0,0,0,"Enraged Tempest - On Just Died - Cast 'Zephyr'");
diff --git a/sql/updates/world/master/2020_11_06_00_world_2017_10_10_04_world.sql b/sql/updates/world/master/2020_11_06_00_world_2017_10_10_04_world.sql
new file mode 100644
index 000000000..0f4bbf46e
--- /dev/null
+++ b/sql/updates/world/master/2020_11_06_00_world_2017_10_10_04_world.sql
@@ -0,0 +1,2 @@
+-- Frankal Stonebridge & Rutgar Glyphshaper
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup` IN (6534, 6533);
diff --git a/sql/updates/world/master/2020_11_06_01_world_2017_10_10_05_world_335.sql b/sql/updates/world/master/2020_11_06_01_world_2017_10_10_05_world_335.sql
new file mode 100644
index 000000000..eeccd6884
--- /dev/null
+++ b/sql/updates/world/master/2020_11_06_01_world_2017_10_10_05_world_335.sql
@@ -0,0 +1,9 @@
+-- Vish Kozus
+DELETE FROM `gossip_menu` WHERE `MenuID`=6531 AND `TextID`=7751;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(6531,7751,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup`= 6531;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,6531,7751,0,0,9,0,8283,0,0,0,0,0,"","Show Gossip Menu Text 7751 if Quest 'Wanted - Deathclasp, Terror of the Sands' is taken"),
+(14,6531,7751,0,1,28,0,8283,0,0,0,0,0,"","Show Gossip Menu Text 7751 if Quest 'Wanted - Deathclasp, Terror of the Sands' is completed");
diff --git a/sql/updates/world/master/2020_11_06_02_world_2017_10_10_06_world_335.sql b/sql/updates/world/master/2020_11_06_02_world_2017_10_10_06_world_335.sql
new file mode 100644
index 000000000..3ef162f0d
--- /dev/null
+++ b/sql/updates/world/master/2020_11_06_02_world_2017_10_10_06_world_335.sql
@@ -0,0 +1,9 @@
+-- Geologist Larksbane
+-- DELETE FROM `gossip_menu` WHERE `MenuID`=6532 AND `TextID`=7748;
+-- INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+-- (6532,7748,0);
+-- gossip_menu already exists in master
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup`= 6532;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,6532,7748,0,0,28,0,8285,0,0,0,0,0,"","Show Gossip Menu Text 7748 if Quest 'The Deserter' is completed");
diff --git a/sql/updates/world/master/2020_11_06_03_world_2017_10_10_07_world_335.sql b/sql/updates/world/master/2020_11_06_03_world_2017_10_10_07_world_335.sql
new file mode 100644
index 000000000..d69f55130
--- /dev/null
+++ b/sql/updates/world/master/2020_11_06_03_world_2017_10_10_07_world_335.sql
@@ -0,0 +1,9 @@
+-- Hermit Ortell
+-- DELETE FROM `gossip_menu` WHERE `MenuID`=6596 AND `TextID`=7817;
+-- INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+-- (6596,7817,0);
+-- gossip_menu already exists in master
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup`= 6596;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,6596,7817,0,0,8,0,8285,0,0,0,0,0,"","Show Gossip Menu Text 7817 if Quest 'The Deserter' is rewarded");
diff --git a/sql/updates/world/master/2020_11_06_04_world_2017_10_10_08_world_335.sql b/sql/updates/world/master/2020_11_06_04_world_2017_10_10_08_world_335.sql
new file mode 100644
index 000000000..c10059222
--- /dev/null
+++ b/sql/updates/world/master/2020_11_06_04_world_2017_10_10_08_world_335.sql
@@ -0,0 +1,5 @@
+-- Bor Wildmane
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup`= 6583;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,6583,7839,0,0,8,0,8361,0,0,0,0,0,"","Show Gossip Menu Text 7839 if Quest 'Abyssal Contacts' is rewarded"),
+(14,6583,7839,0,0,5,0,609,224,0,0,0,0,"","Show Gossip Menu Text 7839 if player is honored, revered or exalted with Cenarion Circle");
diff --git a/sql/updates/world/master/2020_11_06_05_world_2017_10_10_09_world_335.sql b/sql/updates/world/master/2020_11_06_05_world_2017_10_10_09_world_335.sql
new file mode 100644
index 000000000..036409082
--- /dev/null
+++ b/sql/updates/world/master/2020_11_06_05_world_2017_10_10_09_world_335.sql
@@ -0,0 +1,51 @@
+-- Lesser Wind Stone
+DELETE FROM `gossip_menu` WHERE `MenuID`=6540 AND `TextID`=7744;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(6540,7744,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup`= 6540;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,6540,7771,0,0,1,0,24746,0,0,0,0,0,"","Show Gossip Menu Text 7771 if player has aura 'Twilight Cultist Disguise (I)'"),
+(14,6540,7744,0,0,1,0,24746,0,0,1,0,0,"","Show Gossip Menu Text 7744 if player has NOT aura 'Twilight Cultist Disguise (I)'");
+
+-- Wind Stone
+DELETE FROM `gossip_menu` WHERE `MenuID`=6542 AND `TextID` IN (7749, 7773);
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(6542,7749,0),
+(6542,7773,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup`= 6542;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,6542,7773,0,0,1,0,24746,0,0,0,0,0,"","Show Gossip Menu Text 7773 if player has aura 'Twilight Cultist Disguise (I)'"),
+(14,6542,7773,0,0,1,0,24748,0,0,0,0,0,"","Show Gossip Menu Text 7773 if player has aura 'Twilight Cultist Disguise (II)'"),
+(14,6542,7772,0,0,1,0,24746,0,0,0,0,0,"","Show Gossip Menu Text 7772 if player has aura 'Twilight Cultist Disguise (I)'"),
+(14,6542,7772,0,0,1,0,24748,0,0,1,0,0,"","Show Gossip Menu Text 7772 if player has NOT aura 'Twilight Cultist Disguise (II)'"),
+(14,6542,7749,0,0,1,0,24746,0,0,1,0,0,"","Show Gossip Menu Text 7749 if player has NOT aura 'Twilight Cultist Disguise (I)'");
+
+-- Greater Wind Stone
+DELETE FROM `gossip_menu` WHERE `MenuID`=6543 AND `TextID` IN (7774, 7754, 7775);
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(6543,7774,0),
+(6543,7754,0),
+(6543,7775,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup`= 6543;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,6543,7774,0,0,1,0,24746,0,0,0,0,0,"","Show Gossip Menu Text 7774 if player has aura 'Twilight Cultist Disguise (I)'"),
+(14,6543,7774,0,0,1,0,24748,0,0,0,0,0,"","Show Gossip Menu Text 7774 if player has aura 'Twilight Cultist Disguise (II)'"),
+(14,6543,7774,0,0,1,0,24782,0,0,0,0,0,"","Show Gossip Menu Text 7774 if player has aura 'Twilight Cultist Disguise (III)'"),
+(14,6543,7775,0,0,1,0,24746,0,0,0,0,0,"","Show Gossip Menu Text 7775 if player has aura 'Twilight Cultist Disguise (I)'"),
+(14,6543,7775,0,0,1,0,24748,0,0,0,0,0,"","Show Gossip Menu Text 7775 if player has aura 'Twilight Cultist Disguise (II)'"),
+(14,6543,7775,0,0,1,0,24782,0,0,1,0,0,"","Show Gossip Menu Text 7775 if player has NOT aura 'Twilight Cultist Disguise (III)'"),
+(14,6543,7776,0,0,1,0,24746,0,0,0,0,0,"","Show Gossip Menu Text 7776 if player has aura 'Twilight Cultist Disguise (I)'"),
+(14,6543,7776,0,0,1,0,24748,0,0,1,0,0,"","Show Gossip Menu Text 7776 if player has NOT aura 'Twilight Cultist Disguise (II)'"),
+(14,6543,7754,0,0,1,0,24746,0,0,1,0,0,"","Show Gossip Menu Text 7754 if player has NOT aura 'Twilight Cultist Disguise (I)'");
+
+-- master misses the entry
+-- UPDATE `npc_text` SET `text0_0`="A thunderous voice bellows from the stone...$B$BI sense your Medallion of Station, cultist, but you have no ring of lordship?  Are you truly a commander of the Twilight's Hammer, or do you merely run errands for your betters?", `text0_1`="A thunderous voice bellows from the stone...$B$BI sense your Medallion of Station, cultist, but you have no ring of lordship?  Are you truly a commander of the Twilight's Hammer, or do you merely run errands for your betters?", `BroadcastTextID0`=10749 WHERE `ID`=7775;
+
+-- add missing stuff to master
+DELETE FROM `npc_text` WHERE `ID` In (7774, 7775);
+INSERT INTO `npc_text` (`ID`, `Probability0`, `Probability1`, `Probability2`, `Probability3`, `Probability4`, `Probability5`, `Probability6`, `Probability7`, `BroadcastTextID0`, `BroadcastTextID1`, `BroadcastTextID2`, `BroadcastTextID3`, `BroadcastTextID4`, `BroadcastTextID5`, `BroadcastTextID6`, `BroadcastTextID7`, `VerifiedBuild`) VALUES 
+(7774, 1, 0, 0, 0, 0, 0, 0, 0, 10706, 0, 0, 0, 0, 0, 0, 0, 0),
+(7775, 1, 0, 0, 0, 0, 0, 0, 0, 10749, 0, 0, 0, 0, 0, 0, 0, 0);
diff --git a/sql/updates/world/master/2020_11_06_06_world_2017_10_11_00_world.sql b/sql/updates/world/master/2020_11_06_06_world_2017_10_11_00_world.sql
new file mode 100644
index 000000000..47b9b0ab6
--- /dev/null
+++ b/sql/updates/world/master/2020_11_06_06_world_2017_10_11_00_world.sql
@@ -0,0 +1,135 @@
+-- D.E.H.T.A. Enforcer
+DELETE FROM `creature_text` WHERE `CreatureID`= 25808 AND `ID`>=0;
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(25808,0,0,' Do you think us fools! You\'re covered in animal blood!',12,0,100,5,4000,0,25052,0,'D.E.H.T.A. Enforcer'),
+(25808,0,1,' BUTCHER! DIE!',12,0,100,5,4000,0,25053,0,'D.E.H.T.A. Enforcer'),
+(25808,0,2,' Calf killer! Murderer! You will pay for this!',12,0,100,5,4000,0,25054,0,'D.E.H.T.A. Enforcer');
+
+-- Archdruid Lathorius <D.E.H.T.A.>
+DELETE FROM `creature_text` WHERE `CreatureID`= 25809 AND `ID`>=0;
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(25809,0,0,' Do you think us fools! You\'re covered in animal blood!',12,0,100,5,4000,0,25052,0,'Archdruid Lathorius <D.E.H.T.A.>'),
+(25809,0,1,' BUTCHER! DIE!',12,0,100,5,4000,0,25053,0,'Archdruid Lathorius <D.E.H.T.A.>'),
+(25809,0,2,' Calf killer! Murderer! You will pay for this!',12,0,100,5,4000,0,25054,0,'Archdruid Lathorius <D.E.H.T.A.>');
+
+-- Hierophant Cenius <D.E.H.T.A.>
+DELETE FROM `creature_text` WHERE `CreatureID`= 25810 AND `ID`>=0;
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(25810,0,0,' Do you think us fools! You\'re covered in animal blood!',12,0,100,5,4000,0,25052,0,'Hierophant Cenius <D.E.H.T.A.>'),
+(25810,0,1,' BUTCHER! DIE!',12,0,100,5,4000,0,25053,0,'Hierophant Cenius <D.E.H.T.A.>'),
+(25810,0,2,' Calf killer! Murderer! You will pay for this!',12,0,100,5,4000,0,25054,0,'Hierophant Cenius <D.E.H.T.A.>');
+
+-- Zaza <D.E.H.T.A.>
+DELETE FROM `creature_text` WHERE `CreatureID`=25811 AND `ID`>=0;
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(25811,0,0,' Do you think us fools! You\'re covered in animal blood!',12,0,100,5,4000,0,25052,0,'Zaza <D.E.H.T.A.>'),
+(25811,0,1,' BUTCHER! DIE!',12,0,100,5,4000,0,25053,0,'Zaza <D.E.H.T.A.>'),
+(25811,0,2,' Calf killer! Murderer! You will pay for this!',12,0,100,5,4000,0,25054,0,'Zaza <D.E.H.T.A.>');
+
+-- Killinger the Den Watcher <D.E.H.T.A.>
+DELETE FROM `creature_text` WHERE `CreatureID`= 25812 AND `ID`>=0;
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(25812,0,0,' Do you think us fools! You\'re covered in animal blood!',12,0,100,5,4000,0,25052,0,'Killinger the Den Watcher <D.E.H.T.A.>'),
+(25812,0,1,' BUTCHER! DIE!',12,0,100,5,4000,0,25053,0,'Killinger the Den Watcher <D.E.H.T.A.>'),
+(25812,0,2,' Calf killer! Murderer! You will pay for this!',12,0,100,5,4000,0,25054,0,'Killinger the Den Watcher <D.E.H.T.A.>');
+
+-- D.E.H.T.A. Enforcer (BIRD)
+DELETE FROM `creature_text` WHERE `CreatureID`= 25819 AND `ID`>=0;
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(25819,0,0,' Do you think us fools! You\'re covered in animal blood!',12,0,100,5,4000,0,25052,0,'D.E.H.T.A. Enforcer'),
+(25819,0,1,' BUTCHER! DIE!',12,0,100,5,4000,0,25053,0,'D.E.H.T.A. Enforcer'),
+(25819,0,2,' Calf killer! Murderer! You will pay for this!',12,0,100,5,4000,0,25054,0,'D.E.H.T.A. Enforcer');
+
+-- Hierophant Liandra <D.E.H.T.A.>
+DELETE FROM `creature_text` WHERE `CreatureID`= 25838 AND `ID`>=0;
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(25838,0,0,' Do you think us fools! You\'re covered in animal blood!',12,0,100,5,4000,0,25052,0,'Hierophant Liandra <D.E.H.T.A.>'),
+(25838,0,1,' BUTCHER! DIE!',12,0,100,5,4000,0,25053,0,'Hierophant Liandra <D.E.H.T.A.>'),
+(25838,0,2,' Calf killer! Murderer! You will pay for this!',12,0,100,5,4000,0,25054,0,'Hierophant Liandra <D.E.H.T.A.>');
+
+-- D.E.H.T.A. Enforcer SAI
+SET @ENTRY := 25808;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"D.E.H.T.A. Enforcer - On Aggro - Say Line 0"),
+(@ENTRY,0,1,0,10,0,100,0,1,20,0,0,49,2,0,0,0,0,0,25,20,1,0,0,0,0,0,"D.E.H.T.A. Enforcer - Within 1-20 Range Out of Combat LoS - Start Attacking");
+
+-- D.E.H.T.A. Enforcer SAI
+SET @ENTRY := 25819;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"D.E.H.T.A. Enforcer - On Aggro - Say Line 0"),
+(@ENTRY,0,1,0,10,0,100,0,1,20,0,0,49,0,0,0,0,0,0,25,20,1,0,0,0,0,0,"D.E.H.T.A. Enforcer - Within 1-20 Range Out of Combat LoS - Start Attacking");
+
+-- Arch Druid Lathorius SAI
+SET @ENTRY := 25809;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arch Druid Lathorius - On Aggro - Say Line 0"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arch Druid Lathorius - On Aggro - Remove Npc Flags Gossip & Questgiver"),
+(@ENTRY,0,2,0,10,0,100,0,1,20,0,0,49,0,0,0,0,0,0,25,20,1,0,0,0,0,0,"Arch Druid Lathorius - Within 1-20 Range Out of Combat LoS - Start Attacking"),
+(@ENTRY,0,3,0,25,0,100,0,0,0,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arch Druid Lathorius - On Reset - Set Npc Flags Gossip & Questgiver");
+
+-- Zaza SAI
+SET @ENTRY := 25811;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zaza - On Aggro - Say Line 0"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zaza - On Aggro - Remove Npc Flag Questgiver"),
+(@ENTRY,0,2,0,10,0,100,0,1,20,0,0,49,0,0,0,0,0,0,25,20,1,0,0,0,0,0,"Zaza - Within 1-20 Range Out of Combat LoS - Start Attacking"),
+(@ENTRY,0,3,0,25,0,100,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zaza - On Reset - Set Npc Flag Questgiver");
+
+-- Hierophant Cenius SAI
+SET @ENTRY := 25810;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hierophant Cenius - On Aggro - Say Line 0"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hierophant Cenius - On Aggro - Remove Npc Flag Questgiver"),
+(@ENTRY,0,2,0,10,0,100,0,1,20,0,0,49,0,0,0,0,0,0,25,20,1,0,0,0,0,0,"Hierophant Cenius - Within 1-20 Range Out of Combat LoS - Start Attacking"),
+(@ENTRY,0,3,0,25,0,100,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hierophant Cenius - On Reset - Set Npc Flag Questgiver");
+
+-- Killinger the Den Watcher SAI
+SET @ENTRY := 25812;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Killinger the Den Watcher - On Aggro - Say Line 0"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Killinger the Den Watcher - On Aggro - Remove Npc Flag Questgiver"),
+(@ENTRY,0,2,0,10,0,100,0,1,20,0,0,49,0,0,0,0,0,0,25,20,1,0,0,0,0,0,"Killinger the Den Watcher - Within 1-20 Range Out of Combat LoS - Start Attacking"),
+(@ENTRY,0,3,0,25,0,100,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Killinger the Den Watcher - On Reset - Set Npc Flag Questgiver");
+
+-- Hierophant Liandra SAI
+SET @ENTRY := 25838;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hierophant Liandra - On Aggro - Say Line 0"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hierophant Liandra - On Aggro - Remove Npc Flag Questgiver"),
+(@ENTRY,0,2,0,10,0,100,0,1,25,0,0,49,0,0,0,0,0,0,25,25,1,0,0,0,0,0,"Hierophant Liandra - Within 1-25 Range Out of Combat LoS - Start Attacking"),
+(@ENTRY,0,3,0,25,0,100,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hierophant Liandra - On Reset - Set Npc Flag Questgiver"),
+(@ENTRY,0,4,0,4,0,100,0,0,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hierophant Liandra - On Aggro - Remove Flag Standstate Sit Down"),
+(@ENTRY,0,5,0,25,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hierophant Liandra - On Reset - Set Flag Standstate Sit Down");
+
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (29894, 25819);
+UPDATE `creature` SET `MovementType`=0, `spawndist`=0 WHERE `id`=25819;
+
+SET @NPC:=132984;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,1329840,0,0,0,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1329840;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(1329840,1,3197.389, 5262.509, 59.1744, 5.665670,0,0,0,100,0),
+(1329840,2,3205.473, 5261.450, 59.1744, 0.418089,0,0,0,100,0),
+(1329840,3,3213.649, 5266.860, 59.1744, 0.630147,0,0,0,100,0),
+(1329840,4,3220.222, 5276.440, 59.1744, 1.021275,0,0,0,100,0),
+(1329840,5,3219.638, 5285.621, 59.1744, 1.939406,0,0,0,100,0),
+(1329840,6,3211.313, 5295.542, 59.1744, 2.873245,0,0,0,100,0),
+(1329840,7,3199.114, 5292.031, 59.1744, 3.573035,0,0,0,100,0),
+(1329840,8,3193.253, 5282.330, 59.1744, 4.762128,0,0,0,100,0),
+(1329840,9,3195.002, 5273.082, 59.1744, 4.700867,0,0,0,100,0);
diff --git a/sql/updates/world/master/2020_11_07_00_world_2017_10_13_01_world.sql b/sql/updates/world/master/2020_11_07_00_world_2017_10_13_01_world.sql
new file mode 100644
index 000000000..82c96282f
--- /dev/null
+++ b/sql/updates/world/master/2020_11_07_00_world_2017_10_13_01_world.sql
@@ -0,0 +1,4 @@
+-- Mana Wyrm SAI
+DELETE FROM `smart_scripts` WHERE `entryorguid`=15274 AND `source_type`=0 AND `id`=3;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(15274,0,3,0,0,0,100,0,4000,8000,8000,12000,11,25602,0,0,0,0,0,5,0,0,0,0,0,0,0,"Mana Wyrm - In Combat - Cast 'Faerie Fire'");
diff --git a/sql/updates/world/master/2020_11_08_00_world_2017_10_13_02_world.sql b/sql/updates/world/master/2020_11_08_00_world_2017_10_13_02_world.sql
new file mode 100644
index 000000000..e8cd23022
--- /dev/null
+++ b/sql/updates/world/master/2020_11_08_00_world_2017_10_13_02_world.sql
@@ -0,0 +1,9 @@
+-- Vindicator Palanaar
+DELETE FROM `gossip_menu` WHERE `MenuID`=7367 AND `TextID`=8803;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(7367,8803,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7367;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,7367,8802,0,0,16,0,767,0,0,0,0,0,"","Show gossip text 8802 if player is not a Draenei"),
+(14,7367,8803,0,0,16,0,1024,0,0,0,0,0,"","Show gossip text 8803 if player is a Draenei");
diff --git a/sql/updates/world/master/2020_11_08_01_world_2017_10_13_04_world_335.sql b/sql/updates/world/master/2020_11_08_01_world_2017_10_13_04_world_335.sql
new file mode 100644
index 000000000..e5041dd51
--- /dev/null
+++ b/sql/updates/world/master/2020_11_08_01_world_2017_10_13_04_world_335.sql
@@ -0,0 +1,50 @@
+-- Beetix Ficklespragg & Noggle Ficklespragg
+DELETE FROM `gossip_menu` WHERE `MenuID`=6544 AND `TextID`=7752;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(6544,7752,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 14 AND `SourceGroup`= 6544;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,6544,7753,0,0,8,0,8278,0,0,1,0,0,"","Show Gossip Menu Text 7753 if Quest 'Noggle's Last Hope' is NOT rewarded"),
+(14,6544,7752,0,0,8,0,8278,0,0,0,0,0,"","Show Gossip Menu Text 7752 if Quest 'Noggle's Last Hope' is rewarded");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (15189, 15190);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(15189,0,0,"You were always the troublemaker in the family, Noggle.  Always!",12,0,100,0,0,0,10751,0,"Beetix Ficklespragg"),
+(15190,0,0,"Yes!  I'm cured!  I'm cure... whoa, got up too fast!",12,0,100,0,0,0,10675,0,"Noggle Ficklespragg"),
+(15190,1,0,"Thanks for finding my reagents!  *yawn*  That poison's made me... a bit tired...",12,0,100,0,0,0,10676,0,"Noggle Ficklespragg"),
+(15190,2,0,"Wha... where am I?  So... weak..",12,0,100,0,0,0,10672,0,"Noggle Ficklespragg");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (15189, 15190);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (15189, 15190) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1519000, 1519001, 1519002) AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(15189,0,0,0,1,0,100,0,1000,15000,150000,180000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Beetix Ficklespragg - Out of Combat - Say Line 0"),
+(15189,0,1,0,20,0,100,0,8277,0,0,0,45,1,1,0,0,0,0,19,15190,0,0,0,0,0,0,"Beetix Ficklespragg - On Quest 'Deadly Desert Venom' Finished - Set Data 1"),
+(15189,0,2,0,20,0,100,0,8278,0,0,0,45,2,2,0,0,0,0,19,15190,0,0,0,0,0,0,"Beetix Ficklespragg - On Quest 'Noggle's Last Hope' Finished - Set Data 2"),
+(15190,0,0,0,25,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Reset - Set Event Phase 1"),
+(15190,0,1,0,38,1,100,0,1,1,0,0,80,1519000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Data 1 Set - Run Script 1 (Phase 1)"),
+(15190,0,2,0,38,1,100,0,2,2,0,0,80,1519001,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Data 2 Set - Run Script 2 (Phase 1)"),
+(15190,0,3,0,20,1,100,0,8282,0,0,0,80,1519002,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Quest 'Noggle's Lost Satchel' Finished - Run Script 3 (Phase 1)"),
+(1519000,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 1 - Set Event Phase 0"),
+(1519000,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 1 - Say Line 2"),
+(1519000,9,2,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 1 - Remove Flag Standstate Dead"),
+(1519000,9,3,0,0,0,100,0,0,0,0,0,17,64,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 1 - Set Emote State Stun"),
+(1519000,9,4,0,0,0,100,0,5000,5000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 1 - Set Emote State None"),
+(1519000,9,5,0,0,0,100,0,0,0,0,0,90,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 1 - Set Flag Standstate Dead"),
+(1519000,9,6,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 1 - Set Event Phase 1"),
+(1519001,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 2 - Set Event Phase 0"),
+(1519001,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 2 - Say Line 0"),
+(1519001,9,2,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 2 - Remove Flag Standstate Dead"),
+(1519001,9,3,0,0,0,100,0,0,0,0,0,5,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 2 - Play Emote Cheer"),
+(1519001,9,4,0,0,0,100,0,10000,10000,0,0,90,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 2 - Set Flag Standstate Dead"),
+(1519001,9,5,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 2 - Set Event Phase 1"),
+(1519002,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 3 - Set Event Phase 0"),
+(1519002,9,1,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 3 - Remove Flag Standstate Dead"),
+(1519002,9,2,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 1 - Say Line 3"),
+(1519002,9,3,0,0,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 3 - Set Flag Standstate Sit"),
+(1519002,9,4,0,0,0,100,0,10000,10000,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 3 - Remove Flag Standstate Sit"),
+(1519002,9,5,0,0,0,100,0,1000,1000,0,0,90,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 3 - Set Flag Standstate Dead"),
+(1519002,9,6,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Noggle Ficklespragg - On Script 3 - Set Event Phase 1");
+
+UPDATE `smart_scripts` SET `event_param3`=6000,`event_param4`=8000, `action_param2`=0 WHERE `entryorguid`=11319 AND `source_type`=0 AND `id`=0;
diff --git a/sql/updates/world/master/2020_11_08_02_world_2017_10_13_08_world.sql b/sql/updates/world/master/2020_11_08_02_world_2017_10_13_08_world.sql
new file mode 100644
index 000000000..f186c9dd6
--- /dev/null
+++ b/sql/updates/world/master/2020_11_08_02_world_2017_10_13_08_world.sql
@@ -0,0 +1,22 @@
+--
+-- DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (7582,7583,7585);
+-- INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
+-- (7582,0,0,'Greetings, elder. It is time for your people to end their hostility toward the draenei and their allies.',14872,1,3,7583,0,0,0,'',0,-1),
+-- (7583,0,0,'I did not mean to deceive you, elder. The draenei of Telredor thought to approach you in a way that would be familiar to you.',14874,1,3,7585,0,0,0,'',0,-1),
+-- (7585,0,0,'I will tell them. Farewell, elder.',14879,1,3,7586,0,0,0,'',0,-1);
+-- update existing entries
+UPDATE `gossip_menu_option` SET `OptionType`=1, `OptionNpcFlag`=3 WHERE  `MenuId`=7582 AND `OptionIndex`=0;
+UPDATE `gossip_menu_option` SET `OptionType`=1, `OptionNpcFlag`=3 WHERE  `MenuId`=7583 AND `OptionIndex`=0;
+UPDATE `gossip_menu_option` SET `OptionType`=1, `OptionNpcFlag`=3 WHERE  `MenuId`=7585 AND `OptionIndex`=0;
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 18197;
+
+DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 18197);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(18197, 0, 0, 0, 62, 0, 100, 0, 7585, 0, 0, 0, 11, 32152, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Elder Kuruti - On Gossip Option 0 Selected - Add \'Elder Kuruti\'s Response\'');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 7582;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7582,0,0,1,8,0,9803,0,0,1,0,'','Elder Kuruti - Show Gossip Option 0 if Quest 9803 is not rewarded'),
+(15,7582,0,0,1,9,0,9803,0,0,0,0,'','Elder Kuruti - Show Gossip Option 0 if Quest 9803 is taken'),
+(15,7582,0,0,1,2,0,24573,1,0,1,0,'','Elder Kuruti - Show Gossip Option 0 if player does not have item 24573 in inventory');
diff --git a/sql/updates/world/master/2021_01_02_00_world.sql b/sql/updates/world/master/2021_01_02_00_world.sql
new file mode 100644
index 000000000..b8e9d7b07
--- /dev/null
+++ b/sql/updates/world/master/2021_01_02_00_world.sql
@@ -0,0 +1 @@
+UPDATE `access_requirement` SET `level_min`=0,`level_max`=0;