diff --git a/sql/updates/world/master/2021_09_05_00_world_2018_03_09_04_world.sql b/sql/updates/world/master/2021_09_05_00_world_2018_03_09_04_world.sql
new file mode 100644
index 000000000..14447f9ba
--- /dev/null
+++ b/sql/updates/world/master/2021_09_05_00_world_2018_03_09_04_world.sql
@@ -0,0 +1,2 @@
+-- Ashtongue Deathsworn
+UPDATE `smart_scripts` SET `event_type`=54, `comment`="Ashtongue Deathsworn - On Just Summoned - Start Waypoint" WHERE `entryorguid`=21701 AND `source_type`=0 AND `id`=0;
diff --git a/sql/updates/world/master/2021_09_05_01_world_2018_03_09_05_world.sql b/sql/updates/world/master/2021_09_05_01_world_2018_03_09_05_world.sql
new file mode 100644
index 000000000..33f0f4f18
--- /dev/null
+++ b/sql/updates/world/master/2021_09_05_01_world_2018_03_09_05_world.sql
@@ -0,0 +1,3 @@
+-- 
+DELETE FROM `gameobject_template_addon` WHERE `entry` IN (300010,300015,300028,300052,300056,300064,300084,300085,300107,300115,300126,300160,300162,300165,300180,300191,300195,300196,300205);
+DELETE FROM `gameobject_template` WHERE `entry` IN (300010,300015,300028,300052,300056,300064,300084,300085,300107,300115,300126,300160,300162,300165,300180,300191,300195,300196,300205);
diff --git a/sql/updates/world/master/2021_09_05_02_world_2018_03_09_09_world.sql b/sql/updates/world/master/2021_09_05_02_world_2018_03_09_09_world.sql
new file mode 100644
index 000000000..ab0a52d1c
--- /dev/null
+++ b/sql/updates/world/master/2021_09_05_02_world_2018_03_09_09_world.sql
@@ -0,0 +1,3 @@
+-- 
+DELETE FROM `gameobject` WHERE `guid` IN (99928,99929,99930,99931,99932,99933,99934);
+DELETE FROM `gameobject_addon` WHERE `guid` IN (99928,99929,99930,99931,99932,99933,99934);
diff --git a/sql/updates/world/master/2021_09_05_03_world_2018_03_09_06_world_335.sql b/sql/updates/world/master/2021_09_05_03_world_2018_03_09_06_world_335.sql
new file mode 100644
index 000000000..432531970
--- /dev/null
+++ b/sql/updates/world/master/2021_09_05_03_world_2018_03_09_06_world_335.sql
@@ -0,0 +1,34 @@
+-- Rhapsody Shindigger
+DELETE FROM `creature_text` WHERE `CreatureID`=5634;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5634,0,0,"Time to brew up a Kalimdor Kocktail! Hiccup!",12,7,100,4,0,0,1950,0,"Rhapsody Shindigger"),
+(5634,1,0,"That should do it! Hiccup!",12,7,100,0,0,0,1951,0,"Rhapsody Shindigger"),
+(5634,2,0,"%s chugs his drink.",16,0,100,92,0,0,1952,0,"Rhapsody Shindigger"),
+(5634,3,0,"Hiccup!",12,7,100,34,0,0,1953,0,"Rhapsody Shindigger"),
+(5634,4,0,"Ok, who pushed me down? Was it you, $n? Someone turn the lights back on. Hiccup!",12,7,100,6,0,0,1954,0,"Rhapsody Shindigger"),
+(5634,5,0,"One more sip of the ol' fire water and I'll be ready to talk. Hiccup! Cheers!",12,7,100,1,0,0,1955,0,"Rhapsody Shindigger"),
+(5634,6,0,"So, $n, I'm ready to tell you what happened in the Swamp of Sorrows. Hiccup!",12,7,100,1,0,0,1956,0,"Rhapsody Shindigger");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5634;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5634 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=563400 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
+(5634,0,0,0,20,0,100,0,1452,0,0,0,80,563400,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Quest 'Rhapsody's Kalimdor Kocktail' Finished - Run Script"),
+(563400,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Remove Npc Flag Questgiver"),
+(563400,9,1,0,0,0,100,0,0,0,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Set Emote State 0"),
+(563400,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Say Line 0"),
+(563400,9,3,0,0,0,100,0,3000,3000,0,0,5,33,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Play Emote 33"),
+(563400,9,4,0,0,0,100,0,2000,2000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Set Emote State 133"),
+(563400,9,5,0,0,0,100,0,8000,8000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Set Emote State 0"),
+(563400,9,6,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Say Line 1"),
+(563400,9,7,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Say Line 2"),
+(563400,9,8,0,0,0,100,0,3000,3000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Say Line 3"),
+(563400,9,9,0,0,0,100,0,2000,2000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Say Line 4"),
+(563400,9,10,0,0,0,100,0,3500,3500,0,0,5,33,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Play Emote 33"),
+(563400,9,11,0,0,0,100,0,1500,1500,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Say Line 5"),
+(563400,9,12,0,0,0,100,0,4500,4500,0,0,5,92,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Play Emote 92"),
+(563400,9,13,0,0,0,100,0,3000,3000,0,0,5,34,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Play Emote 34"),
+(563400,9,14,0,0,0,100,0,2000,2000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Say Line 6"),
+(563400,9,15,0,0,0,100,0,3000,3500,0,0,5,33,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Play Emote 33"),
+(563400,9,16,0,0,0,100,0,2000,2000,0,0,17,93,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Set Emote State 93"),
+(563400,9,17,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Add Npc Flag Questgiver");
diff --git a/sql/updates/world/master/2021_09_05_05_world_2018_03_10_00_world.sql b/sql/updates/world/master/2021_09_05_05_world_2018_03_10_00_world.sql
new file mode 100644
index 000000000..3e7f934b1
--- /dev/null
+++ b/sql/updates/world/master/2021_09_05_05_world_2018_03_10_00_world.sql
@@ -0,0 +1,125 @@
+-- Duplicates removed
+DELETE FROM `creature` WHERE `guid` IN (129516,129555,129532,129520,129556,129545);
+DELETE FROM `creature_addon` WHERE `guid` IN (129516,129555,129532,129520,129556,129545);
+
+-- Death Knight Initiate 
+UPDATE `creature` SET `modelid`=0, `spawntimesecs` = 30 WHERE `id` = 28406;
+UPDATE `creature_addon` SET `auras` = "" WHERE `guid` IN (129492,129493,129494,129495,129496,129497,129498,129499);
+UPDATE `creature_addon` SET `path_id` = 1295170 WHERE `guid` IN (129517);
+UPDATE `creature_addon` SET `path_id` = 1295180 WHERE `guid` IN (129518);
+UPDATE `creature_addon` SET `path_id` = 1295290 WHERE `guid` IN (129529);
+UPDATE `creature_addon` SET `path_id` = 1295300 WHERE `guid` IN (129530);
+UPDATE `creature_addon` SET `path_id` = 1295310 WHERE `guid` IN (129531);
+UPDATE `creature_addon` SET `path_id` = 1295440 WHERE `guid` IN (129544);
+UPDATE `creature_addon` SET `path_id` = 1295460 WHERE `guid` IN (129546);
+UPDATE `creature_addon` SET `path_id` = 1295470 WHERE `guid` IN (129547);
+-- #1
+UPDATE `creature` SET `position_x` = 2409.489, `position_y` = -5729.18, `position_z` = 153.92, `orientation` = 3.8, `spawndist` = 0, `MovementType` = 2 WHERE `guid` = 129547;
+DELETE FROM `waypoint_data` WHERE `id`= 1295470;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `action_chance`, `move_type`) VALUES
+(1295470,1,2409.489,-5729.18,153.92,2000,0,3.8,100,0),
+(1295470,2,2398.24,-5738.1,153.923,0,0,3.51732,100,0),
+(1295470,3,2386.8,-5734.52,153.922,0,0,2.57013,100,0),
+(1295470,4,2372.86,-5722.17,153.922,0,0,2.26872,100,0),
+(1295470,5,2366.02,-5712.39,153.922,0,0,1.78963,100,0),
+(1295470,6,2365.51,-5706.24,153.922,0,0,0.855789,100,0),
+(1295470,7,2368.78,-5703.15,153.922,10000,0,0.690856,100,0),
+(1295470,8,2358.21,-5706.16,153.922,0,0,2.85855,100,0),
+(1295470,9,2341.04,-5689.82,153.922,0,0,2.3292,100,0),
+(1295470,10,2313.73,-5661.47,152.761,0,0,2.56639,100,0),
+(1295470,11,2296.29,-5652.93,147.341,0,0,2.88369,100,0),
+(1295470,12,2278.16,-5647.89,143.137,0,0,2.9638,100,0),
+(1295470,13,2255.96,-5645.48,136.996,0,0,3.24733,100,0),
+(1295470,14,2234.36,-5647.77,130.968,0,0,3.42954,100,0),
+(1295470,15,2209.59,-5657.5,122.594,0,0,3.76412,100,0),
+(1295470,16,2188.9,-5675.6,113.179,0,0,3.89371,100,0),
+(1295470,17,2163.24,-5699.88,104.99,1000,0,3.94476,100,0),
+(1295470,18,2149.23,-5715.65,101.528,1000,1188,3.99581,100,0);
+-- #2
+UPDATE `creature` SET `position_x` = 2455.27, `position_y` = -5523.46, `position_z` = 376.892, `orientation` = 5.96, `spawndist` = 0, `MovementType` = 2 WHERE `guid` = 129544;
+DELETE FROM `waypoint_data` WHERE `id`= 1295440;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `action_chance`, `move_type`) VALUES
+(1295440,1,2455.27,-5523.46,376.892,1000,0,5.96,100,0),
+(1295440,2,2451.31,-5528.92,376.891,0,0,3.66393,100,0),
+(1295440,3,2424.47,-5542.18,376.905,0,0,3.84064,100,0),
+(1295440,4,2403.66,-5563.52,377.005,0,0,4.24905,100,0),
+(1295440,5,2398.1,-5601.44,376.89,0,0,4.6064,100,0),
+(1295440,6,2397.91,-5614.95,377.018,0,0,4.26946,100,0),
+(1295440,7,2386.16,-5630.91,377.169,0,0,4.1116,100,0),
+(1295440,8,2379.33,-5642.43,382.439,0,0,4.2137,100,0),
+(1295440,9,2349.92,-5690.11,382.241,6000,1188,4.12338,100,0);
+-- #3
+UPDATE `creature` SET `position_x` = 2416.227, `position_y` = -5557.54, `position_z` = 376.89, `orientation` = 1.72, `MovementType` = 2, `spawndist` = 0 WHERE `guid` = 129518;
+DELETE FROM `waypoint_data` WHERE `id`= 1295180;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `action_chance`, `move_type`) VALUES
+(1295180,1,2416.227,-5557.54,376.89,1000,0,1.72,100,0),
+(1295180,2,2411.56,-5553.34,376.887,0,0,4.06137,100,0),
+(1295180,3,2396.85,-5576.58,376.906,0,0,4.57353,100,0),
+(1295180,4,2397.55,-5612.24,377.017,0,0,4.15728,100,0),
+(1295180,5,2377.61,-5641.62,382.439,0,0,3.72139,100,0),
+(1295180,6,2350.25,-5690.08,382.24,3000,1188,3.64364,100,0);
+-- #4
+UPDATE `creature` SET `position_x` = 2523.21, `position_y` = -5628.21, `position_z` = 377.004, `orientation` = 1.93, `MovementType` = 2, `spawndist` = 0 WHERE `guid` = 129529;
+DELETE FROM `waypoint_data` WHERE `id`= 1295290;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `action_chance`, `move_type`) VALUES
+(1295290,1,2523.21,-5628.21,377.004,1000,0,1.93,100,0),
+(1295290,2,2517.63,-5625.44,377.01,0,0,3.57347,100,0),
+(1295290,3,2480.55,-5653.1,376.997,0,0,3.48315,100,0),
+(1295290,4,2454.17,-5656.89,376.903,0,0,3.08653,100,0),
+(1295290,5,2426.21,-5647.1,377.148,0,0,2.74566,100,0),
+(1295290,6,2397.13,-5648.46,377.169,0,0,3.41325,100,0),
+(1295290,7,2385.79,-5652.5,382.439,0,0,3.6638,100,0),
+(1295290,8,2370,-5666.09,382.256,0,0,3.98424,100,0),
+(1295290,9,2354.86,-5693.19,382.239,5000,1188,4.18451,100,0);
+-- #5
+UPDATE `creature` SET `position_x` = 2477.05, `position_y` = -5647.81, `position_z` = 377.006, `orientation` = 5.92, `MovementType` = 2, `spawndist` = 0 WHERE `guid` = 129517;
+DELETE FROM `waypoint_data` WHERE `id`= 1295170;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `action_chance`, `move_type`) VALUES
+(1295170,1,2477.05,-5647.81,377.006,1000,0,5.92,100,0),
+(1295170,2,2478.18,-5653.36,377.01,0,0,3.68083,100,0),
+(1295170,3,2465.83,-5657.38,376.892,0,0,3.28028,100,0),
+(1295170,4,2420.22,-5645.76,376.89,0,0,3.26536,100,0),
+(1295170,5,2397.62,-5648.51,377.168,0,0,3.48684,100,0),
+(1295170,6,2386.39,-5653.11,382.439,0,0,3.7311,100,0),
+(1295170,7,2369.21,-5667.63,382.253,0,0,4.09474,100,0),
+(1295170,8,2353.39,-5690.9,382.239,3000,1188,3.8222,100,0);
+-- #6
+UPDATE `creature` SET `position_x` = 2413.64, `position_y` = -5737.27, `position_z` = 153.923, `orientation` = 3.86902, `MovementType` = 2, `spawndist` = 0 WHERE `guid` = 129546;
+DELETE FROM `waypoint_data` WHERE `id`= 1295460;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `action_chance`, `move_type`) VALUES
+(1295460,1,2413.64,-5737.27,153.923,1000,0,3.86902,100,0),
+(1295460,2,2373.33,-5754.69,153.961,0,0,3.34356,100,0),
+(1295460,3,2349.31,-5761.49,153.922,5000,0,1.76884,100,0),
+(1295460,4,2367,-5771.87,151.392,0,0,6.06104,100,0),
+(1295460,5,2380.8,-5774.62,154.028,0,0,6.11209,100,0),
+(1295460,6,2416.41,-5776.45,148.509,0,0,6.01155,100,0),
+(1295460,7,2430.24,-5787.44,140.563,0,0,5.40444,100,0),
+(1295460,8,2437.59,-5808,127.202,0,0,4.96462,100,0),
+(1295460,9,2441.6,-5832.16,117.571,0,0,4.86645,100,0),
+(1295460,10,2430.39,-5856.4,107.743,1000,0,4.06142,100,0),
+(1295460,11,2442.87,-5912.91,102.116,1000,1188,4.90965,100,0);
+-- #7
+UPDATE `creature` SET `position_x` = 2352.14, `position_y` = -5757.91, `position_z` = 153.923, `MovementType` = 2, `spawndist` = 0 WHERE `guid` = 129531;
+DELETE FROM `waypoint_data` WHERE `id`= 1295310;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `action_chance`, `move_type`) VALUES
+(1295310,1,2352.14,-5757.91,153.923,1000,0,3.23752,100,0),
+(1295310,2,2352.14,-5757.91,153.923,4000,0,3.23752,100,0),
+(1295310,3,2341.61,-5727.9,153.922,0,0,1.55677,100,0),
+(1295310,4,2342.13,-5697.18,153.922,0,0,1.84658,100,0),
+(1295310,5,2317.47,-5651.82,151.422,0,0,2.33588,100,0),
+(1295310,6,2297.54,-5644.36,147.052,0,0,2.94867,100,0),
+(1295310,7,2245.47,-5638.62,135.882,0,0,3.22356,100,0),
+(1295310,8,2205.02,-5658.24,121.031,0,0,3.8778,100,0),
+(1295310,9,2161.18,-5703.33,104.27,1000,0,4.13698,100,0),
+(1295310,10,2178.08,-5770.89,101.346,1000,1188,5.00484,100,0);
+-- #8
+UPDATE `creature` SET `position_x` = 2368.652588, `position_y` = -5703.335449, `position_z` = 153.922272, `orientation` = 0.69, `MovementType` = 2, `spawndist` = 0 WHERE `guid` = 129530;
+DELETE FROM `waypoint_data` WHERE `id`= 1295300;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `action_chance`, `move_type`) VALUES
+(1295300,1,2368.652588,-5703.335449,153.922272,1000,0,0.69,100,0),
+(1295300,2,2373.52,-5722.48,153.922,0,0,5.28585,100,0),
+(1295300,3,2411.22,-5764.47,152.347,0,0,5.47748,100,0),
+(1295300,4,2429.98,-5784.48,142.151,0,0,5.22694,100,0),
+(1295300,5,2435.23,-5800.88,131.736,0,0,4.99918,100,0),
+(1295300,6,2431.43,-5850.32,109.292,1000,0,4.36615,100,0),
+(1295300,7,2417.03,-5895.6,104.705,1000,1188,4.31903,100,0);
diff --git a/sql/updates/world/master/2021_09_05_06_world_2018_03_10_01_world.sql b/sql/updates/world/master/2021_09_05_06_world_2018_03_10_01_world.sql
new file mode 100644
index 000000000..f68bc3ccc
--- /dev/null
+++ b/sql/updates/world/master/2021_09_05_06_world_2018_03_10_01_world.sql
@@ -0,0 +1,2 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceEntry` IN (52683) AND `SourceTypeOrReferenceId`=13 AND `ConditionValue2`=28897;
diff --git a/sql/updates/world/master/2021_09_06_00_world_2018_03_10_03_world.sql b/sql/updates/world/master/2021_09_06_00_world_2018_03_10_03_world.sql
new file mode 100644
index 000000000..0b5153ed7
--- /dev/null
+++ b/sql/updates/world/master/2021_09_06_00_world_2018_03_10_03_world.sql
@@ -0,0 +1,19 @@
+DELETE FROM `creature_template_movement` WHERE `CreatureId` IN (2673, 2674, 17578, 16111, 24792, 32543, 32546, 32547, 32542, 32545, 30527, 31143, 31144, 31146, 32541, 32666, 32667);
+INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`) VALUES
+(2673,  1, 0, 0, 1),
+(2674,  1, 0, 0, 1),
+(17578, 1, 0, 0, 1),
+(16111, 1, 0, 0, 1),
+(24792, 1, 0, 0, 1),
+(32543, 1, 0, 0, 1),
+(32546, 1, 0, 0, 1),
+(32547, 1, 0, 0, 1),
+(32542, 1, 0, 0, 1),
+(32545, 1, 0, 0, 1),
+(30527, 1, 0, 0, 1),
+(31143, 1, 0, 0, 1),
+(31144, 1, 0, 0, 1),
+(31146, 1, 0, 0, 1),
+(32541, 1, 0, 0, 1),
+(32666, 1, 0, 0, 1),
+(32667, 1, 0, 0, 1);
diff --git a/sql/updates/world/master/2021_09_06_01_world_2018_03_11_00_world.sql b/sql/updates/world/master/2021_09_06_01_world_2018_03_11_00_world.sql
new file mode 100644
index 000000000..b1e6e689d
--- /dev/null
+++ b/sql/updates/world/master/2021_09_06_01_world_2018_03_11_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `gameobject` SET `PhaseId`=0, `spawntimesecs`=-1 WHERE `id`=192538;
diff --git a/sql/updates/world/master/2021_09_06_02_world_2018_03_12_00_world.sql b/sql/updates/world/master/2021_09_06_02_world_2018_03_12_00_world.sql
new file mode 100644
index 000000000..8bc1cad59
--- /dev/null
+++ b/sql/updates/world/master/2021_09_06_02_world_2018_03_12_00_world.sql
@@ -0,0 +1,11 @@
+-- 
+UPDATE `smart_scripts` SET `event_param5`=1 WHERE event_type=10 AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_param2`=30, `event_param5`=1 WHERE `entryorguid`=24248 AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=24938 AND event_type=10 AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_param1`=1 WHERE `entryorguid`in (27376,27378,27379,27381) AND event_type=10 AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_param1`=1, `event_param2`=20, `event_param5`=0 WHERE `entryorguid`=30313 AND `event_type`=10 AND `source_type`=0;
+UPDATE `creature_template` SET `AIName`=""  WHERE `entry`=32582;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (32582) AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_flags`=0, `event_param2`=10, `event_param3`=60000, `event_param4`=60000, `event_param5`=1 WHERE `entryorguid`=5917 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_flags`=0, `event_param1`=1, `event_param2`=20, `event_param3`=40000, `event_param4`=60000, `event_param5`=1 WHERE `entryorguid`=9021 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_param5`=0 WHERE `entryorguid` IN (27246,  2775, 23370, 23760, 24845, 23675, 23673, 23672, 24271, 24364, 24468, 24510, 24527, 24718, 24938,24979,25063,30313) AND event_type=10 AND `source_type`=0;
diff --git a/sql/updates/world/master/2021_09_06_03_world_2018_03_13_00_world.sql b/sql/updates/world/master/2021_09_06_03_world_2018_03_13_00_world.sql
new file mode 100644
index 000000000..5a0c4ba35
--- /dev/null
+++ b/sql/updates/world/master/2021_09_06_03_world_2018_03_13_00_world.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_proc` WHERE `SpellId`=70904;
+INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
+(70904, 0x0, 6, 0x00000000, 0x00000000, 0x00000800, 2048, 0x4, 0x0, 0x0, 0x0, 0, 0, 0, 0);
+
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dreamwalker_guardian_spirit_restriction';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(47788,'spell_dreamwalker_guardian_spirit_restriction');
diff --git a/sql/updates/world/master/2021_09_06_04_world_2018_03_13_01_world.sql b/sql/updates/world/master/2021_09_06_04_world_2018_03_13_01_world.sql
new file mode 100644
index 000000000..c051b060f
--- /dev/null
+++ b/sql/updates/world/master/2021_09_06_04_world_2018_03_13_01_world.sql
@@ -0,0 +1,3 @@
+-- 
+UPDATE `creature_template_addon` SET `auras`="31261" WHERE `entry` IN (20561);
+UPDATE `smart_scripts` SET `action_type`=41, `action_param1`=0 WHERE `entryorguid` IN (20561) AND `source_type`=0 AND `id`=2;
diff --git a/sql/updates/world/master/2021_09_06_05_world_2018_03_15_00_world.sql b/sql/updates/world/master/2021_09_06_05_world_2018_03_15_00_world.sql
new file mode 100644
index 000000000..0ade27aee
--- /dev/null
+++ b/sql/updates/world/master/2021_09_06_05_world_2018_03_15_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `event_param1`=18000, `event_param2`=18000, `event_param3`=18000, `event_param4`=18000 WHERE `entryorguid` IN (-111996, -112005) AND `source_type`=0 AND `id`=0;