diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index ab1173071..5d1e1968b 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1106,6 +1106,7 @@ INSERT INTO `rbac_linked_permissions` VALUES
 (196,842),
 (196,843),
 (196,869),
+(196,872),
 (197,232),
 (197,236),
 (197,237),
@@ -2026,7 +2027,8 @@ INSERT INTO `rbac_permissions` VALUES
 (853,'Command: .reload conversation_template'),
 (854,'Command: .debug conversation'),
 (868,'Command: modify power'),
-(869,'Command: debug send playerchoice');
+(869,'Command: debug send playerchoice'),
+(872,'Command: server debug');
 /*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2232,8 +2234,9 @@ INSERT INTO `updates` VALUES
 ('2017_12_31_00_auth.sql','1721ACBD35EB95FAE33B9E95F8C4E4B1FB70A5E4','ARCHIVED','2017-12-31 20:15:23',0),
 ('2018_01_02_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','ARCHIVED','2018-01-02 20:40:37',0),
 ('2018_02_18_00_auth.sql','8489DD3EFFE14A7486B593435F0BA2BC69B6EABF','ARCHIVED','2018-02-18 16:35:55',0),
-('2018_02_19_00_auth.sql','07CE658C5EF88693D3C047EF8E724F94ADA74C15','RELEASED','2018-02-19 22:33:32',233),
-('2018_02_28_00_auth.sql','E92EF4ABF7FA0C66649E1633DD0459F44C09EB83','RELEASED','2018-02-28 23:07:59',0);
+('2018_02_19_00_auth.sql','07CE658C5EF88693D3C047EF8E724F94ADA74C15','ARCHIVED','2018-02-19 22:33:32',233),
+('2018_02_28_00_auth.sql','E92EF4ABF7FA0C66649E1633DD0459F44C09EB83','ARCHIVED','2018-02-28 23:07:59',0),
+('2018_03_14_00_auth.sql','2D71E93DF7419A30D0D21D8A80CF05698302575A','ARCHIVED','2018-03-14 23:07:59',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/auth/master/2018_03_14_00_auth.sql b/sql/updates/auth/master/2018_03_14_00_auth.sql
new file mode 100644
index 000000000..ddaf1d13f
--- /dev/null
+++ b/sql/updates/auth/master/2018_03_14_00_auth.sql
@@ -0,0 +1,5 @@
+DELETE FROM `rbac_permissions` WHERE `id`=872;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(872, 'Command: server debug');
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(196, 872);
diff --git a/sql/updates/world/master/2018_03_11_05_world_2016_11_27_03_world .sql b/sql/updates/world/master/2018_03_11_05_world_2016_11_27_03_world.sql
similarity index 100%
rename from sql/updates/world/master/2018_03_11_05_world_2016_11_27_03_world .sql
rename to sql/updates/world/master/2018_03_11_05_world_2016_11_27_03_world.sql
diff --git a/sql/updates/world/master/2018_03_14_00_auth.sql b/sql/updates/world/master/2018_03_14_00_auth.sql
new file mode 100644
index 000000000..24705a297
--- /dev/null
+++ b/sql/updates/world/master/2018_03_14_00_auth.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name`='server debug';
+INSERT INTO `command` (`name`, `permission`, `help`) VALUES
+('server debug', 872, 'Syntax: .server debug\n\nShows detailed information about server setup, useful when reporting a bug');
diff --git a/sql/updates/world/master/2018_03_17_00_world_2016_12_23_01_world.sql b/sql/updates/world/master/2018_03_17_00_world_2016_12_23_01_world.sql
new file mode 100644
index 000000000..7840ea026
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_00_world_2016_12_23_01_world.sql
@@ -0,0 +1 @@
+UPDATE `vehicle_template_accessory` SET `minion`=0 WHERE `entry`=33293 AND `accessory_entry`=33329;
diff --git a/sql/updates/world/master/2018_03_17_01_world_2016_12_24_00_world.sql b/sql/updates/world/master/2018_03_17_01_world_2016_12_24_00_world.sql
new file mode 100644
index 000000000..403ee80fd
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_01_world_2016_12_24_00_world.sql
@@ -0,0 +1,2 @@
+-- Fix emblem frost exploit in Ruby Sanctum
+UPDATE `creature_template` SET `flags_extra`=`flags_extra` | 1 WHERE `entry`IN(39823,39920,39805);
diff --git a/sql/updates/world/master/2018_03_17_02_world_2016_12_24_02_world.sql b/sql/updates/world/master/2018_03_17_02_world_2016_12_24_02_world.sql
new file mode 100644
index 000000000..a00928d96
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_02_world_2016_12_24_02_world.sql
@@ -0,0 +1,17 @@
+--
+-- [Q] Altered Beings - http://wotlk.openwow.com/quest=880 
+-- Tonga Runetotem SAI - delay textevent
+SET @ENTRY := 3448;
+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,1,20,0,100,0,880,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Tonga Runetotem - On Quest 'Altered Beings' Finished - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 344800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Tonga Runetotem - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,5000,5000,0,0,1,1,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Tonga Runetotem - On Script - Say Line 1"),
+(@ENTRY,9,2,0,0,0,100,0,4000,4000,0,0,1,2,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Tonga Runetotem - On Script - Say Line 2"),
+(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,1,3,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Tonga Runetotem - On Script - Say Line 3");
diff --git a/sql/updates/world/master/2018_03_17_03_world_2016_12_13_05_world.sql b/sql/updates/world/master/2018_03_17_03_world_2016_12_13_05_world.sql
new file mode 100644
index 000000000..9085e17b4
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_03_world_2016_12_13_05_world.sql
@@ -0,0 +1,350 @@
+
+-- 
+-- Birds in Sethekk Halls - spawns and paths
+-- Set InhabitType to flying
+UPDATE `creature_template` SET `InhabitType`= 4 WHERE  `entry` IN (21931);
+
+SET @GUID := 99126; -- 15 unused GUIDs from TC
+
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+14;
+INSERT INTO `creature` (guid, id, map, spawnMask, position_x, position_y, position_z, orientation, spawntimesecs, curhealth, curmana, spawndist, MovementType) VALUES
+(@GUID+0,  21931, 556, 6, -69.078,   255.062,  27.6692,  2.23169,   1, 6326, 0, 0, 2),
+(@GUID+1,  21931, 556, 6,  84.91618, 251.3969, 37.0668,  3.204143,  1, 6326, 0, 0, 2),
+(@GUID+2,  21931, 556, 6,  82.7928,  251.0653, 37.0668,  3.192098,  1, 6326, 0, 0, 2),
+(@GUID+3,  21931, 556, 6, -55.35431, 292.4135, 27.84376, 3.334406,  1, 6326, 0, 0, 2),
+(@GUID+4,  21931, 556, 6, -56.81138, 293.4768, 27.82975, 1.066901,  1, 6326, 0, 0, 2),
+(@GUID+5,  21931, 556, 6, -109.229,  288.209,  53.3584,  3.249347,  1, 6326, 0, 0, 2),
+(@GUID+6,  21931, 556, 6, -77.7733,  299.15,   60.5558,  5.757163,  1, 6326, 0, 0, 2),
+(@GUID+7,  21931, 556, 6, -52.39689, 293.2879, 27.82958, 1.420948,  1, 6326, 0, 0, 2),
+(@GUID+8,  21931, 556, 6, -65.26201, 281.413,  47.28283, 0.8305511, 1, 6326, 0, 0, 2),
+(@GUID+9,  21931, 556, 6, -59.42,    289.0999, 27.89292, 2.894336,  1, 6326, 0, 0, 2),
+(@GUID+10, 21931, 556, 6, -102.279,  278.86,   56.0703,  5.414571,  1, 6326, 0, 0, 2),
+(@GUID+11, 21931, 556, 6, -86.60637, 286.1224, 27.48317, 2.953945,  1, 6326, 0, 0, 2),
+(@GUID+12, 21931, 556, 6, -68.3353,  281.741,  61.757,   3.844181,  1, 6326, 0, 0, 2),
+(@GUID+13, 21931, 556, 6, -71.9701,  272.574,  59.1446,  6.184331,  1, 6326, 0, 0, 2),
+(@GUID+14, 21931, 556, 6, -84.35631, 263.7281, 27.80793, 4.523829,  1, 6326, 0, 0, 2);
+
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+14;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@GUID+0,  (@GUID+0) *10, 0, 0, 1, 0, ''),
+(@GUID+1,  (@GUID+1) *10, 0, 0, 1, 0, ''),
+(@GUID+2,  (@GUID+2) *10, 0, 0, 1, 0, ''),
+(@GUID+3,  (@GUID+3) *10, 0, 0, 1, 0, ''),
+(@GUID+4,  (@GUID+4) *10, 0, 0, 1, 0, ''),
+(@GUID+5,  (@GUID+5) *10, 0, 0, 1, 0, ''),
+(@GUID+6,  (@GUID+6) *10, 0, 0, 1, 0, ''),
+(@GUID+7,  (@GUID+7) *10, 0, 0, 1, 0, ''),
+(@GUID+8,  (@GUID+8) *10, 0, 0, 1, 0, ''),
+(@GUID+9,  (@GUID+9) *10, 0, 0, 1, 0, ''),
+(@GUID+10, (@GUID+10)*10, 0, 0, 1, 0, ''),
+(@GUID+11, (@GUID+11)*10, 0, 0, 1, 0, ''),
+(@GUID+12, (@GUID+12)*10, 0, 0, 1, 0, ''),
+(@GUID+13, (@GUID+13)*10, 0, 0, 1, 0, ''),
+(@GUID+14, (@GUID+14)*10, 0, 0, 1, 0, '');
+
+-- 1.
+SET @PATH := (@GUID+0) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1,  -69.078,  255.062, 27.6692),
+(@PATH, 2,  -69.078,  255.062, 27.6692),
+(@PATH, 3,  -77.6467, 256.825, 27.8182),
+(@PATH, 4,  -85.5541, 263.248, 37.4314),
+(@PATH, 5,  -89.3701, 273.449, 46.1637),
+(@PATH, 6,  -87.3918, 283.626, 55.5433),
+(@PATH, 7,  -81.6323, 288.392, 67.374),
+(@PATH, 8,  -83.6451, 281.803, 77.323),
+(@PATH, 9,  -97.3242, 280.983, 74.488),
+(@PATH, 10, -95.2966, 294.303, 27.4832),
+(@PATH, 11, -91.9066, 298.554, 40.3148),
+(@PATH, 12, -84.9968, 296.969, 52.3776),
+(@PATH, 13, -81.5458, 289.807, 63.8514),
+(@PATH, 14, -91.5585, 284.275, 71.9894),
+(@PATH, 15, -95.834,  292.943, 27.4832),
+(@PATH, 16, -94.3393, 295.352, 41.1404),
+(@PATH, 17, -88.5665, 292.19, 53.5047),
+(@PATH, 18, -88.0789, 284.173, 65.0211),
+(@PATH, 19, -96.7033, 282.247, 75.63),
+(@PATH, 20, -92.1857, 296.241, 27.4832);
+
+-- 2.
+SET @PATH := (@GUID+1) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1,  -84.3563, 263.728, 27.8079),
+(@PATH, 2,  -87.4666, 261.464, 58.4138),
+(@PATH, 3,  -94.4575, 270.352, 66.6585),
+(@PATH, 4,  -95.7386, 284.443, 27.4832),
+(@PATH, 5,  -91.3219, 290.488, 39.2894),
+(@PATH, 6,  -84.573,  290.53,  51.5467),
+(@PATH, 7,  -83.1581, 284.409, 64.0506),
+(@PATH, 8,  -92.9101, 280.978, 73.484),
+(@PATH, 9,  -96.079,  293.202, 74.566),
+(@PATH, 10, -82.8515, 297.569, 74.9201),
+(@PATH, 11, -77.4638, 284.989, 27.4832),
+(@PATH, 12, -81.0183, 279.803, 39.9446),
+(@PATH, 13, -89.1536, 280.506, 51.3678),
+(@PATH, 14, -94.1382, 293.611, 27.4832),
+(@PATH, 15, -88.9669, 297.982, 39.6762),
+(@PATH, 16, -84.4414, 293.357, 52.098),
+(@PATH, 17, -86.5034, 284.787, 63.0289),
+(@PATH, 18, -97.8593, 278.945, 26.2094),
+(@PATH, 19, -83.9472, 285.452, 63.0513),
+(@PATH, 20, -93.4871, 275.608, 26.8408);
+
+-- 3.
+SET @PATH := (@GUID+2) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1,   84.9162, 251.397, 37.0668),
+(@PATH, 2,   83.9651, 251.088, 37.0668),
+(@PATH, 3,   51.4796, 252.183, 37.0668),
+(@PATH, 4,   33.2474, 282.432, 37.0668),
+(@PATH, 5,  -4.58595, 288.248, 37.0668),
+(@PATH, 6,  -33.1252, 287.388, 33.6501),
+(@PATH, 7,  -63.6614, 287.145, 37.0668),
+(@PATH, 8,  -86.5805, 281.312, 37.0668),
+(@PATH, 9,  -122.867, 287.583, 33.7057),
+(@PATH, 10, -166.135, 286.002, 37.0668),
+(@PATH, 11, -197.129, 319.599, 41.5668),
+(@PATH, 12, -226.722, 321.688, 41.5391),
+(@PATH, 13, -241.978, 284.026, 37.0668),
+(@PATH, 14, -241.867, 239.697, 34.7891),
+(@PATH, 15, -240.409, 205.258, 33.289),
+(@PATH, 16, -247.921, 181.826, 37.0668),
+(@PATH, 17, -258.541, 176.818, 28.8724),
+(@PATH, 18, -254.589, 187.929, 17.5946),
+(@PATH, 19, -233.282, 183.525, 9.45569),
+(@PATH, 20, -207.969, 174.104, 9.45569),
+(@PATH, 21, -174.273, 173.592, 7.17792),
+(@PATH, 22, -153.428, 164.087, 10.4835),
+(@PATH, 23, -141.719, 162.854, 10.9835),
+(@PATH, 24, -125.931, 171.58,  9.15015),
+(@PATH, 25, -97.7346, 173.65,  7.15014),
+(@PATH, 26, -82.8989, 173.921, 10.3168),
+(@PATH, 27, -73.9182, 173.077, 10.3168),
+(@PATH, 28, -69.9846, 163.459, 10.3168),
+(@PATH, 29, -70.2812, 156.773, 9.34458),
+(@PATH, 30, -71.1548, 128.592, 6.7057),
+(@PATH, 31, -80.0383, 115.576, 7.51125),
+(@PATH, 32, -82.5443, 99.0856, 7.51125),
+(@PATH, 33, -74.7056, 88.5289, 7.51125),
+(@PATH, 34, -60.1037, 87.1475, 7.51125),
+(@PATH, 35, -43.8567, 99.2091, 7.03903),
+(@PATH, 36, -21.4774, 99.8071, 7.26125),
+(@PATH, 37,  7.50968, 100.248, 7.51125),
+(@PATH, 38,  27.4025, 97.8097, 19.3168),
+(@PATH, 39,  37.0373, 95.8226, 30.8446);
+
+-- 4.
+SET @PATH := (@GUID+3) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -119.16,  291.958, 26.7305),
+(@PATH, 2, -119.16,  291.958, 26.7305),
+(@PATH, 3, -118.246, 291.551, 26.7198),
+(@PATH, 4, -116.125, 290.169, 41.5238),
+(@PATH, 5, -114.528, 275.12,  40.1532),
+(@PATH, 6, -90.689,  265.24,  41.0333),
+(@PATH, 7, -62.0894, 286.098, 48.6939),
+(@PATH, 8, -76.8407, 304.686, 51.9439),
+(@PATH, 9, -98.7576, 303.572, 46.4161);
+
+-- 5.
+SET @PATH := (@GUID+4) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1,  -56.8114, 293.477, 27.8298),
+(@PATH, 2,  -58.7468, 295.764, 29.4033),
+(@PATH, 3,  -80.8255, 317.109, 28.9557),
+(@PATH, 4,  -84.6018, 313.357, 62.0829),
+(@PATH, 5,  -100.485, 310.06,  60.6726),
+(@PATH, 6,  -119.643, 290.201, 57.4676),
+(@PATH, 7,  -119.602, 271.028, 61.3137),
+(@PATH, 8,  -99.3827, 260.039, 59.8997),
+(@PATH, 9,  -62.9444, 265.206, 63.3061),
+(@PATH, 10, -53.9817, 286.896, 63.0482),
+(@PATH, 11, -66.9341, 300.934, 58.5854),
+(@PATH, 12, -82.0958, 309.241, 61.3414),
+(@PATH, 13, -100.199, 310.19,  60.9001),
+(@PATH, 14, -109.249, 296.2,   58.5368),
+(@PATH, 15, -112.956, 287.824, 28.945),
+(@PATH, 16, -131.244, 263.41,  30.9794),
+(@PATH, 17, -124.562, 262.687, 57.9071),
+(@PATH, 18, -89.1208, 261.935, 60.3001),
+(@PATH, 19, -66.6449, 264.328, 64.3038),
+(@PATH, 20, -56.4546, 270.201, 65.3866),
+(@PATH, 21, -53.7442, 287.453, 64.0839),
+(@PATH, 22, -56.4072, 293.549, 29.5758);
+
+-- 6.
+SET @PATH := (@GUID+5) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1,  -59.42,   289.1,   27.8929),
+(@PATH, 2,  -58.7468, 295.764, 29.4033),
+(@PATH, 3,  -80.8255, 317.109, 28.9557),
+(@PATH, 4,  -84.6018, 313.357, 62.0829),
+(@PATH, 5,  -100.485, 310.06,  60.6726),
+(@PATH, 6,  -119.643, 290.201, 57.4676),
+(@PATH, 7,  -119.602, 271.028, 61.3137),
+(@PATH, 8,  -99.3827, 260.039, 59.8997),
+(@PATH, 9,  -62.9444, 265.206, 63.3061),
+(@PATH, 10, -53.9817, 286.896, 63.0482),
+(@PATH, 11, -66.9341, 300.934, 58.5854),
+(@PATH, 12, -82.0958, 309.241, 61.3414),
+(@PATH, 13, -100.199, 310.19,  60.9001),
+(@PATH, 14, -109.249, 296.2,   58.5368),
+(@PATH, 15, -112.956, 287.824, 28.945),
+(@PATH, 16, -131.244, 263.41,  30.9794),
+(@PATH, 17, -124.562, 262.687, 57.9071),
+(@PATH, 18, -89.1208, 261.935, 60.3001),
+(@PATH, 19, -66.6449, 264.328, 64.3038),
+(@PATH, 20, -56.4546, 270.201, 65.3866),
+(@PATH, 21, -53.7442, 287.453, 64.0839),
+(@PATH, 22, -56.4072, 293.549, 29.5758);
+
+-- 7.
+SET @PATH := (@GUID+6) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1,  -52.3969, 293.288, 27.8296),
+(@PATH, 2,  -58.7468, 295.764, 29.4033),
+(@PATH, 3,  -80.8255, 317.109, 28.9557),
+(@PATH, 4,  -84.6018, 313.357, 62.0829),
+(@PATH, 5,  -100.485, 310.06,  60.6726),
+(@PATH, 6,  -119.643, 290.201, 57.4676),
+(@PATH, 7,  -119.602, 271.028, 61.3137),
+(@PATH, 8,  -99.3827, 260.039, 59.8997),
+(@PATH, 9,  -62.9444, 265.206, 63.3061),
+(@PATH, 10, -53.9817, 286.896, 63.0482),
+(@PATH, 11, -66.9341, 300.934, 58.5854),
+(@PATH, 12, -82.0958, 309.241, 61.3414),
+(@PATH, 13, -100.199, 310.19,  60.9001),
+(@PATH, 14, -109.249, 296.2,   58.5368),
+(@PATH, 15, -112.956, 287.824, 28.945),
+(@PATH, 16, -131.244, 263.41,  30.9794),
+(@PATH, 17, -124.562, 262.687, 57.9071),
+(@PATH, 18, -89.1208, 261.935, 60.3001),
+(@PATH, 19, -66.6449, 264.328, 64.3038),
+(@PATH, 20, -56.4546, 270.201, 65.3866),
+(@PATH, 21, -53.7442, 287.453, 64.0839),
+(@PATH, 22, -56.4072, 293.549, 29.5758);
+
+-- 8.
+SET @PATH := (@GUID+7) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -62.0894, 286.098, 48.6939),
+(@PATH, 2, -76.8407, 304.686, 51.9439),
+(@PATH, 3, -98.7576, 303.572, 46.4161),
+(@PATH, 4, -119.16,  291.958, 26.7305),
+(@PATH, 5, -119.16,  291.958, 26.7305),
+(@PATH, 6, -118.246, 291.551, 26.7198),
+(@PATH, 7, -116.125, 290.169, 41.5238),
+(@PATH, 8, -114.528, 275.12,  40.1532),
+(@PATH, 9, -90.689,  265.24,  41.0333);
+
+-- 9.
+SET @PATH := (@GUID+8) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -109.229, 288.209, 53.3584),
+(@PATH, 2, -102.279, 278.86,  56.0703),
+(@PATH, 3, -88.1313, 272.423, 59.4688),
+(@PATH, 4, -71.9701, 272.574, 59.1446),
+(@PATH, 5, -68.3353, 281.741, 61.757),
+(@PATH, 6, -77.7733, 299.15,  60.5558),
+(@PATH, 7, -94.7425, 300.49,  56.1018);
+
+-- 10.
+SET @PATH := (@GUID+9) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -71.9701, 272.574, 59.1446),
+(@PATH, 2, -68.3353, 281.741, 61.757),
+(@PATH, 3, -77.7733, 299.15,  60.5558),
+(@PATH, 4, -94.7425, 300.49,  56.1018),
+(@PATH, 5, -109.229, 288.209, 53.3584),
+(@PATH, 6, -102.279, 278.86,  56.0703),
+(@PATH, 7, -88.1313, 272.423, 59.4688);
+
+-- 11.
+SET @PATH := (@GUID+10) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -68.3353, 281.741, 61.757),
+(@PATH, 2, -77.7733, 299.15,  60.5558),
+(@PATH, 3, -94.7425, 300.49,  56.1018),
+(@PATH, 4, -109.229, 288.209, 53.3584),
+(@PATH, 5, -102.279, 278.86,  56.0703),
+(@PATH, 6, -88.1313, 272.423, 59.4688),
+(@PATH, 7, -71.9701, 272.574, 59.1446);
+
+-- 12.
+SET @PATH := (@GUID+11) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -102.279, 278.86,  56.0703),
+(@PATH, 2, -88.1313, 272.423, 59.4688),
+(@PATH, 3, -71.9701, 272.574, 59.1446),
+(@PATH, 4, -68.3353, 281.741, 61.757),
+(@PATH, 5, -77.7733, 299.15,  60.5558),
+(@PATH, 6, -94.7425, 300.49,  56.1018),
+(@PATH, 7, -109.229, 288.209, 53.3584);
+
+-- 13.
+SET @PATH := (@GUID+12) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -77.7733, 299.15,  60.5558),
+(@PATH, 2, -94.7425, 300.49,  56.1018),
+(@PATH, 3, -109.229, 288.209, 53.3584),
+(@PATH, 4, -102.279, 278.86,  56.0703),
+(@PATH, 5, -88.1313, 272.423, 59.4688),
+(@PATH, 6, -71.9701, 272.574, 59.1446),
+(@PATH, 7, -68.3353, 281.741, 61.757);
+
+-- 14.
+SET @PATH := (@GUID+13) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -86.6064, 286.122, 27.4832),
+(@PATH, 2, -84.2669, 286.076, 57.4227),
+(@PATH, 3, -71.9701, 272.574, 59.1446),
+(@PATH, 4, -68.3353, 281.741, 61.757),
+(@PATH, 5, -77.7733, 299.15,  60.5558),
+(@PATH, 6, -94.7425, 300.49,  56.1018),
+(@PATH, 7, -109.229, 288.209, 53.3584),
+(@PATH, 8, -102.279, 278.86,  56.0703),
+(@PATH, 9, -88.1313, 272.423, 59.4688);
+
+-- 15.
+SET @PATH := (@GUID+14) * 10;
+
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1,  84.9162, 251.397, 37.0668),
+(@PATH, 2,  83.9651, 251.088, 37.0668),
+(@PATH, 3,  51.4796, 252.183, 37.0668),
+(@PATH, 4,  33.2474, 282.432, 37.0668),
+(@PATH, 5, -4.58595, 288.248, 37.0668),
+(@PATH, 6, -33.1252, 287.388, 33.6501),
+(@PATH, 7, -63.6614, 287.145, 37.0668),
+(@PATH, 8, -77.5616, 286.325, 98.1903);
+
+UPDATE `waypoint_data` SET `move_type`=1  WHERE `id` IN ((@GUID+0) * 10,(@GUID+1) * 10,(@GUID+2) * 10,(@GUID+3) * 10,(@GUID+4) * 10,(@GUID+5) * 10,(@GUID+6) * 10,(@GUID+7) * 10,(@GUID+8) * 10,(@GUID+9) * 10, (@GUID+10) * 10, (@GUID+11) * 10, (@GUID+12) * 10, (@GUID+13) * 10, (@GUID+14) * 10);
diff --git a/sql/updates/world/master/2018_03_17_04_world_2016_12_24_03_world.sql b/sql/updates/world/master/2018_03_17_04_world_2016_12_24_03_world.sql
new file mode 100644
index 000000000..587770aeb
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_04_world_2016_12_24_03_world.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` IN (22174,22182,22187,22201,22202,22217,22218,22221,22392,22283,22289,22287,22451,22187,22385,22327,22286));
+DELETE FROM `creature` WHERE `id` IN (22174,22182,22187,22201,22202,22217,22218,22221,22392,22283,22289,22287,22451,22187,22385,22327,22286);
+
+UPDATE `creature_template` SET `unit_flags`=33555202 WHERE `entry`=22196;
+
diff --git a/sql/updates/world/master/2018_03_17_05_world_2016_12_24_05_world.sql b/sql/updates/world/master/2018_03_17_05_world_2016_12_24_05_world.sql
new file mode 100644
index 000000000..862fd4562
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_05_world_2016_12_24_05_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 29866;
diff --git a/sql/updates/world/master/2018_03_17_06_world_2016_12_24_06_world.sql b/sql/updates/world/master/2018_03_17_06_world_2016_12_24_06_world.sql
new file mode 100644
index 000000000..dffec0b5b
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_06_world_2016_12_24_06_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid` IN (3616, 3448) AND `source_type`=0 AND `id`=0;
diff --git a/sql/updates/world/master/2018_03_17_07_world_2016_12_24_09_world.sql b/sql/updates/world/master/2018_03_17_07_world_2016_12_24_09_world.sql
new file mode 100644
index 000000000..4f40cec3f
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_07_world_2016_12_24_09_world.sql
@@ -0,0 +1,28 @@
+-- 
+-- [Q] Birds of a Feather -- http://wotlk.openwow.com/quest=9397
+UPDATE `creature` SET `MovementType`=0 WHERE  `guid`=57793;
+DELETE FROM `creature_addon` WHERE  `guid`=57793;
+DELETE FROM `waypoint_data` WHERE `id`=577930;
+-- Falconer Drenna Riverwind SAI
+SET @ENTRY := 16790;
+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,1,20,0,100,0,9397,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Falconer Drenna Riverwind - On Quest 'Birds of a Feather' Finished - Run Script"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Falconer Drenna Riverwind - On Quest 'Birds of a Feather' Finished - Store Targetlist");
+
+-- Actionlist SAI
+SET @ENTRY := 1679000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Run Off"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-597.806,4110.68,90.848,2.02116,"On Script - Move To Position"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,5,16,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Play Emote 16"),
+(@ENTRY,9,3,0,0,0,100,0,2000,2000,0,0,12,17262,1,20000,0,0,0,8,0,0,0,-597.244,4111.88,90.7789,0.805268,"On Script - Summon Creature 'Captive Female Kaliri'"),
+(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,5,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,-596.347,4108.47,91.0061,5.15176,"On Script - Move To Position"),
+(@ENTRY,9,6,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.10152,"On Script - Set Orientation 4,10152");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=16790;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(16790, 0, 0, 'Thank you, $N. It looks like they''re going to get along just fine.', 12, 0, 100, 0, 0, 0, 13666, 'Falconer Drenna Riverwind');
diff --git a/sql/updates/world/master/2018_03_17_08_world_2016_12_24_10_world.sql b/sql/updates/world/master/2018_03_17_08_world_2016_12_24_10_world.sql
new file mode 100644
index 000000000..a300fb5a2
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_08_world_2016_12_24_10_world.sql
@@ -0,0 +1,26 @@
+-- 
+-- [Q] Deciphering the Book -- http://wotlk.openwow.com/quest=9557
+-- Anchorite Paetheus SAI
+SET @ENTRY := 17424;
+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,20,0,100,0,9557,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Anchorite Paetheus - On Quest 'Deciphering the Book' Finished - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 1742400;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,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,"Anchorite Paetheus - On Script - Remove Npc Flag Questgiver"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,1,0,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Anchorite Paetheus - On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,4000,4000,0,0,1,1,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Anchorite Paetheus - On Script - Say Line 1"),
+(@ENTRY,9,3,0,0,0,100,0,6000,6000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Anchorite Paetheus - On Script - Say Line 2"),
+(@ENTRY,9,4,0,0,0,100,0,6000,6000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anchorite Paetheus - On Script - Say Line 3"),
+(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anchorite Paetheus - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=17424;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(17424, 0, 0, 'Now, let\'s see....', 12, 0, 100, 69, 0, 0, 14281, 'Anchorite Paetheus'),
+(17424, 1, 0, 'In the process of translating this, I believe I\'ve learned more about the drunken exploits of a certain \'Andrew Clementine\' than about the journal\'s author.', 12, 0, 100, 1, 0, 0, 14282, 'Anchorite Paetheus'),
+(17424, 2, 0, 'But, no matter. Mister Clementine\'s... err, \'contribution\' notwithstanding, this seems to be the journal of a man named Nolkai. The entries toward the end describe a brutal battle.', 12, 0, 100, 11, 0, 0, 14283, 'Anchorite Paetheus'),
+(17424, 3, 0, 'Take a look at this passage...', 12, 0, 100, 0, 0, 0, 14285, 'Anchorite Paetheus');
diff --git a/sql/updates/world/master/2018_03_17_09_world_2016_12_25_00_world.sql b/sql/updates/world/master/2018_03_17_09_world_2016_12_25_00_world.sql
new file mode 100644
index 000000000..cbe0c3981
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_09_world_2016_12_25_00_world.sql
@@ -0,0 +1,26 @@
+-- 
+-- [Q] Into the Churning Gulch -- http://wotlk.openwow.com/quest=10715
+-- Baron Sablemane SAI
+SET @ENTRY := 22103;
+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,20,0,100,0,10715,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Baron Sablemane - On Quest 'Into the Churning Gulch' Finished - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2210300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,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,"Baron Sablemane - On Script - Remove Npc Flag Questgiver"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Baron Sablemane - On Script - Set Run Off"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,2915.57,5957.42,3.27419,2.97874,"Baron Sablemane - On Script - Move To Position"),
+(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Baron Sablemane - On Script - Set Emote State 69"),
+(@ENTRY,9,4,0,0,0,100,0,7000,7000,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0,"Baron Sablemane - On Script - Set Emote State 26"),
+(@ENTRY,9,5,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,2919.11,5956.93,3.16149,1.03933,"Baron Sablemane - On Script - Move To Position"),
+(@ENTRY,9,6,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,2919.11,5956.93,3.16149,1.58825,"Baron Sablemane - On Script - Move To Position"),
+(@ENTRY,9,7,0,0,0,100,0,1000,1000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Baron Sablemane - On Script - Add Npc Flag Questgiver"),
+(@ENTRY,9,8,0,0,0,100,0,0,0,0,0,1,0,3000,0,0,0,0,1,0,0,0,0,0,0,0,"Baron Sablemane - On Script - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=22103;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(22103, 0, 0, 'There, it is completed.', 12, 0, 100, 0, 0, 0, 19808, 'Baron Sablemane');
diff --git a/sql/updates/world/master/2018_03_17_10_world_2016_12_25_01_world.sql b/sql/updates/world/master/2018_03_17_10_world_2016_12_25_01_world.sql
new file mode 100644
index 000000000..0e4de1437
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_10_world_2016_12_25_01_world.sql
@@ -0,0 +1,33 @@
+-- 
+-- [Q] All Clear! -- http://wotlk.openwow.com/quest=10436
+-- Tashar SAI
+SET @ENTRY := 20913;
+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,20,0,100,0,10436,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Tashar - On Quest 'All Clear!' Finished - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2091300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,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,"On Script - Remove Npc Flag Questgiver"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Run Off"),
+(@ENTRY,9,3,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,4922.18,2991.38,93.9847,5.88582,"On Script - Move To Position"),
+(@ENTRY,9,4,0,0,0,100,0,5000,5000,0,0,17,173,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 173"),
+(@ENTRY,9,5,0,0,0,100,0,4000,4000,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 26"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,11,28730,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Arcane Torrent'"),
+(@ENTRY,9,7,0,0,0,100,0,2000,2000,0,0,50,184614,15,0,0,0,0,8,0,0,0,4923.56,2990.45,93.9413,0.813699,"On Script - Summon Gameobject 'Ethereal Repair Kit'"),
+(@ENTRY,9,8,0,0,0,100,0,0,0,0,0,50,184614,15,0,0,0,0,8,0,0,0,4923.45,2991.21,93.9248,5.49404,"On Script - Summon Gameobject 'Ethereal Repair Kit'"),
+(@ENTRY,9,9,0,0,0,100,0,0,0,0,0,50,184614,15,0,0,0,0,8,0,0,0,4924.47,2990.35,93.8867,2.25067,"On Script - Summon Gameobject 'Ethereal Repair Kit'"),
+(@ENTRY,9,10,0,0,0,100,0,0,0,0,0,50,184614,15,0,0,0,0,8,0,0,0,4924.32,2991.21,93.8808,3.88003,"On Script - Summon Gameobject 'Ethereal Repair Kit'"),
+(@ENTRY,9,11,0,0,0,100,0,2000,2000,0,0,1,1,4000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 1"),
+(@ENTRY,9,12,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,4914.74,2991.92,94.1138,0,"On Script - Move To Position"),
+(@ENTRY,9,13,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.15708,"On Script - Set Orientation 0,15708"),
+(@ENTRY,9,14,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=20913;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(20913, 0, 0, 'Now to begin the repairs.', 12, 0, 100, 0, 0, 0, 18651, 'Tashar'),
+(20913, 1, 0, 'It''s working! Ghabar will be pleased to hear the news.', 12, 0, 100, 0, 0, 0, 18652, 'Tashar');
diff --git a/sql/updates/world/master/2018_03_17_11_world_2016_12_25_02_world.sql b/sql/updates/world/master/2018_03_17_11_world_2016_12_25_02_world.sql
new file mode 100644
index 000000000..b221129c1
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_11_world_2016_12_25_02_world.sql
@@ -0,0 +1,26 @@
+-- [Q] Know Thine Enemy -- http://wotlk.openwow.com/quest=9567
+-- Vindicator Aalesia SAI
+SET @ENTRY := 17433;
+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,1,20,0,100,0,9567,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Vindicator Aalesia - On Quest 'Know Thine Enemy' Finished - Run Script"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Vindicator Aalesia - On Quest 'Know Thine Enemy' Finished - Store Targetlist");
+
+-- Actionlist SAI
+SET @ENTRY := 1743300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,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,"Vindicator Aalesia - On Script - Remove Npc Flag Questgiver"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Vindicator Aalesia - On Script - Set Emote State 69"),
+(@ENTRY,9,2,0,0,0,100,0,4000,4000,0,0,17,26,0,0,0,0,0,1,0,0,0,0,0,0,0,"Vindicator Aalesia - On Script - Set Emote State 26"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,1,0,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Vindicator Aalesia - On Script - Say Line 0"),
+(@ENTRY,9,4,0,0,0,100,0,4000,4000,0,0,1,1,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Vindicator Aalesia - On Script - Say Line 1"),
+(@ENTRY,9,5,0,0,0,100,0,4000,4000,0,0,1,2,2000,0,0,0,0,12,1,0,0,0,0,0,0,"Vindicator Aalesia - On Script - Say Line 2"),
+(@ENTRY,9,6,0,0,0,100,0,2000,2000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Vindicator Aalesia - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=17433;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(17433, 0, 0, 'These pictographs tell a story. This figure at the beginning, almost looks like one of the creatures we encountered at Azure Watch...', 12, 0, 100, 0, 0, 0, 14030, 'Vindicator Aalesia'),
+(17433, 1, 0, 'No, this can\'t be... It says this creature willingly became a servant of the Legion. He transforms into a satyr and receives the Legion\'s "blessing.', 12, 0, 100, 274, 0, 0, 14031, 'Vindicator Aalesia'),
+(17433, 2, 0, 'We must defeat these satyr, $n. We will not suffer the Legion\'s presence in these lands.', 12, 0, 100, 53, 0, 0, 14032, 'Vindicator Aalesia');
diff --git a/sql/updates/world/master/2018_03_17_12_world_2016_12_25_03_world.sql b/sql/updates/world/master/2018_03_17_12_world_2016_12_25_03_world.sql
new file mode 100644
index 000000000..5ffa5fdef
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_12_world_2016_12_25_03_world.sql
@@ -0,0 +1,82 @@
+-- http://wow.gamepedia.com/Matt
+DELETE FROM `creature_text` WHERE `CreatureID`=794;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `Comment`, `BroadcastTextID`) VALUES
+(794, 0, 0, 'Dang! Fish arent biting here either. I am gonna go back to my ol fishin hole!', 12, 7, 100, 0, 0, 0, 'Matt', 894),
+(794, 1, 0, 'Gee, fish sure dont seem to be biting here. Maybe I should go over to Crystal Lake to try my luck there!', 12, 7, 100, 0, 0, 0, 'Matt', 893);
+
+-- Matt SAI
+SET @ENTRY := 794;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100+00,@ENTRY*100+01) 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
+(@ENTRY,0,0,0,25,0,100,512,0,0,0,0,53,0,794,1,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,512,1,794,0,0,54,3597000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,512,1,794,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Waypoint 1 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,512,26,794,0,0,54,900000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Waypoint 26 Reached - Pause Waypoint"),
+(@ENTRY,0,4,0,40,0,100,512,26,794,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Waypoint 26 Reached - Run Script"),
+(@ENTRY*100+00,9,0,0,0,0,100,0,0,0,0,0,71,1,0,1117,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Change Equipment"),
+(@ENTRY*100+00,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,-9387.45,-117.388,58.8643,2.61799,"Matt - On Script - Set Orientation 2,61799"),
+(@ENTRY*100+00,9,2,0,0,0,100,0,3597000,3597000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Say Line 0"),
+(@ENTRY*100+00,9,3,0,0,0,100,0,0,0,0,0,71,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Change Equipment"),
+(@ENTRY*100+01,9,0,0,0,0,100,0,0,0,0,0,71,1,0,1117,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Change Equipment"),
+(@ENTRY*100+01,9,1,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,8,0,0,0,-9429.23,148.94,56.5713,2.118,"Matt - On Script - Set Orientation 2,118"),
+(@ENTRY*100+01,9,2,0,0,0,100,0,897000,897000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Say Line 1"),
+(@ENTRY*100+01,9,3,0,0,0,100,0,0,0,0,0,71,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Change Equipment");
+
+-- Matt Waypoint
+DELETE FROM `waypoints` WHERE `entry`=794;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(@ENTRY, 1 ,-9387.448,-117.388,58.86428, 'Matt'), -- 14:31:28 -- 3600000
+(@ENTRY, 2 ,-9383.961,-114.8808,59.08251, 'Matt'), -- 15:15:41
+(@ENTRY, 3 ,-9380.154,-108.276,59.25655, 'Matt'), -- 15:15:43
+(@ENTRY, 4 ,-9380.848,-101.6898,61.68277, 'Matt'), -- 15:15:45
+(@ENTRY, 5 ,-9387.704,-91.85216,63.20706, 'Matt'), -- 15:15:48
+(@ENTRY, 6 ,-9390.816,-90.64014,64.34749, 'Matt'), -- 15:15:53
+(@ENTRY, 7 ,-9407.41,-88.2923,61.98596, 'Matt'), -- 15:15:56
+(@ENTRY, 8 ,-9413.96,-87.82951,61.04494, 'Matt'), -- 15:16:01
+(@ENTRY, 9 ,-9417.158,-87.50026,60.49351, 'Matt'), -- 15:16:05
+(@ENTRY, 10,-9421.599,-80.92403,60.69189, 'Matt'), -- 15:16:07
+(@ENTRY, 11,-9423.156,-52.4566,63.79184, 'Matt'), -- 15:16:13
+(@ENTRY, 12,-9420.547,-36.44093,63.29053, 'Matt'), -- 15:16:21
+(@ENTRY, 13,-9421.891,-23.8332,62.43909, 'Matt'), -- 15:16:27
+(@ENTRY, 14,-9429.023,0.1944809,60.95766, 'Matt'), -- 15:16:34
+(@ENTRY, 15,-9430.42,6.69886,59.95515, 'Matt'), -- 15:16:41
+(@ENTRY, 16,-9433.049,28.14976,58.22381, 'Matt'), -- 15:16:49
+(@ENTRY, 17,-9432.948,36.57756,57.2988, 'Matt'), -- 15:16:54
+(@ENTRY, 18,-9432.741,48.06789,56.85545, 'Matt'), -- 15:17:01
+(@ENTRY, 19,-9436.523,61.44022,56.62671, 'Matt'), -- 15:17:07
+(@ENTRY, 20,-9423.229,92.4316,57.68261, 'Matt'), -- 15:17:13
+(@ENTRY, 21,-9417.555,104.966,59.53194, 'Matt'), -- 15:17:20
+(@ENTRY, 22,-9413.809,111.0759,60.54739, 'Matt'), -- 15:17:26
+(@ENTRY, 23,-9410.355,126.8208,59.89996, 'Matt'), -- 15:17:32
+(@ENTRY, 24,-9416.291,137.0582,59.09748, 'Matt'), -- 15:17:37
+(@ENTRY, 25,-9421.65,142.9827,58.27094, 'Matt'), -- 15:17:41
+(@ENTRY, 26,-9429.229,148.94,56.57125, 'Matt'), -- 15:17:44  -- 900000
+(@ENTRY, 27,-9424.639,136.6448,59.14201, 'Matt'), -- 14:29:13
+(@ENTRY, 28,-9416.943,128.2254,59.84607, 'Matt'), -- 14:29:20
+(@ENTRY, 29,-9408.01,117.3048,60.68095, 'Matt'), -- 14:29:26
+(@ENTRY, 30,-9404.777,110.4311,60.1431, 'Matt'), -- 14:29:29
+(@ENTRY, 31,-9404.203,99.88391,59.06318, 'Matt'), -- 14:29:34
+(@ENTRY, 32,-9415.88,87.02467,57.41075, 'Matt'), -- 14:29:39
+(@ENTRY, 33,-9420.471,83.63406,56.86155, 'Matt'), -- 14:29:46
+(@ENTRY, 34,-9436.522,69.25112,56.50404, 'Matt'), -- 14:29:55
+(@ENTRY, 35,-9440.947,60.83078,56.30841, 'Matt'), -- 14:29:59
+(@ENTRY, 36,-9430.784,43.44138,57.09395, 'Matt'), -- 14:30:03
+(@ENTRY, 37,-9419.325,27.65322,58.00757, 'Matt'), -- 14:30:11
+(@ENTRY, 38,-9403.117,7.486176,60.30029, 'Matt'), -- 14:30:17
+(@ENTRY, 39,-9393.432,-3.420914,61.21665, 'Matt'), -- 14:30:28
+(@ENTRY, 40,-9380.711,-17.91664,62.45811, 'Matt'), -- 14:30:32
+(@ENTRY, 41,-9379.764,-19.26388,62.62563, 'Matt'), -- 14:30:40
+(@ENTRY, 42,-9366.547,-30.96574,63.63699, 'Matt'), -- 14:30:43
+(@ENTRY, 43,-9358.822,-43.82347,65.27631, 'Matt'), -- 14:30:48
+(@ENTRY, 44,-9356.564,-49.49134,66.07014, 'Matt'), -- 14:30:56
+(@ENTRY, 45,-9358.139,-71.0817,64.59801, 'Matt'), -- 14:30:59
+(@ENTRY, 46,-9358.818,-73.2935,65.17371, 'Matt'), -- 14:31:05
+(@ENTRY, 47,-9364.586,-80.76942,64.87081, 'Matt'), -- 14:31:08
+(@ENTRY, 48,-9367.941,-84.89754,64.55246, 'Matt'), -- 14:31:11
+(@ENTRY, 49,-9374.869,-96.70338,63.28677, 'Matt'), -- 14:31:14
+(@ENTRY, 50,-9377.46,-102.744,61.81012, 'Matt'), -- 14:31:16
+(@ENTRY, 51,-9379.592,-109.5267,59.26672, 'Matt'), -- 14:31:20
+(@ENTRY, 52,-9383.477,-114.4253,59.07925, 'Matt'), -- 14:31:24
+(@ENTRY, 53,-9385.668,-116.1328,59.09434, 'Matt'); -- 14:31:26
diff --git a/sql/updates/world/master/2018_03_17_13_world_2016_12_25_04_world.sql b/sql/updates/world/master/2018_03_17_13_world_2016_12_25_04_world.sql
new file mode 100644
index 000000000..b44d11f11
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_13_world_2016_12_25_04_world.sql
@@ -0,0 +1,90 @@
+-- 
+-- Sabotage the Warp-Gate! (10310)
+DELETE FROM `creature_text` WHERE `CreatureID`=20281;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(20281, 0, 0, "Let's proceed at a brisk pace.", 12, 0, 100, 0, 0, 0, 17941, 'Drijya'),
+(20281, 1, 0, "We'll start at that first energy pylon, straight ahead. Remember, try to keep them off of me.", 12, 0, 100, 25, 0, 0, 17942,  'Drijya'),
+(20281, 2, 0, "I'm done with this pylon. On to the next.", 12, 0, 100, 0, 0, 0, 17943,  'Drijya'),
+(20281, 3, 0, "Alright, pylon two down. Now for the heat manifold.", 12, 0, 100, 0, 0, 0, 17944,  'Drijya'),
+(20281, 4, 0, "That should do it. The teleporter should blow any second now!", 12, 0, 100, 0, 0, 0, 17945,  'Drijya'),
+(20281, 5, 0, "Ok, let's get out of here!", 12, 0, 100, 0, 0, 0, 17946,  'Drijya'),
+(20281, 6, 0, "Thank you, $N! I couldn't have done it without you. You'll let Gahruj know?", 12, 0, 100, 0, 0, 0, 17949,  'Drijya'),
+(20281, 7, 0, "Keep them off me!", 12, 0, 100, 0, 0, 0, 17950,  'Drijya'),
+(20281, 8, 0, "Very well.  Before we head down there, take a moment to prepare yourself.", 12, 0, 100, 0, 0, 0, 17940,  'Drijya');
+
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN(20281, 20296, 20399, 20402, 20403);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(20296, 20281, 20399, 20402, 20403) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(20281*100, 20281*100+1, 20281*100+2, 2028103) 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
+(20281, 0, 0, 0, 19, 0, 100, 0, 10310, 0, 0, 0, 80, 2028100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On Quest Accept - Action list'),
+(2028100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 19, 256+512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Remove unit Flag'),
+(2028100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 83, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - remove npc flag'),
+(2028100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Talk'),
+(2028100, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Store target'),
+(2028100, 9, 4, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 53, 1, 20281, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Start WP'),
+(2028100, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Talk'),
+(20281, 0, 1, 2, 40, 0, 100, 0, 5, 0, 0, 0, 54, 7000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - WP Pause'),
+(20281, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - Talk'),
+(20281, 0, 3, 4, 40, 0, 100, 0, 6, 0, 0, 0, 54, 40000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - WP Pause'),
+(20281, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 20281*100+1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - Script9'),
+(20281, 0, 5, 15, 56, 0, 100, 0, 6, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Resume - Talk'),
+(20281, 0, 6, 7, 40, 0, 100, 0, 9, 0, 0, 0, 54, 40000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - WP Pause'),
+(20281, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 20281*100+2, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - Script9'),
+(20281, 0, 8, 15, 56, 0, 100, 0, 9, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Resume - Talk'),
+(20281, 0, 9, 10, 40, 0, 100, 0, 12, 0, 0, 0, 54, 40000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - WP Pause'),
+(20281, 0, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 4, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - WP reached - Set data'),
+(20281, 0, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 17, 28, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - WP reached - Set Emote State'),
+(20281, 0, 12, 15, 56, 0, 100, 0, 12, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Resume - Talk'),
+(20281, 0, 13, 14, 40, 0, 100, 0, 13, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 20296, 100, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - Set Data'),
+(20281, 0, 14, 0, 61, 0, 100, 0, 0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Resume - Talk'),
+(20281, 0, 15, 0, 61, 0, 100, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Linked - Remove Emote State'),
+(20281, 0, 16, 0, 4, 0, 100, 0, 0, 0, 0, 0, 1, 7, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Drijya - On Aggro - Talk'),
+(20281, 0, 17, 0, 40, 0, 100, 0, 16, 0, 0, 0, 80, 2028103, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - On WP Reached - Action list'),
+(2028103, 9, 0, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 1, 6, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Talk'),
+(2028103, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 18, 256+512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Set Flag'),
+(2028103, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 81, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Set NPC Flag'),
+(2028103, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0.174533, 'Drijya - Action list- Orientation'),
+(2028103, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 15, 10310, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Drijya - Action list - Credit quest'),
+(20281*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 28, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set Emote State'),
+(20281*100+1, 9, 1, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set data'),
+(20281*100+1, 9, 2, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set data'),
+(20281*100+1, 9, 3, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set data'),
+(20281*100+1, 9, 4, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set data'),
+(20281*100+1, 9, 5, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set data'),
+(20281*100+1, 9, 6, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set data'),
+(20281*100+1, 9, 7, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set data'),
+(20281*100+1, 9, 8, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set data'),
+(20281*100+2, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 28, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set Emote State'),
+(20281*100+2, 9, 1, 0, 0, 0, 100, 1, 7000, 7000, 0, 0, 45, 1, 3, 0, 0, 0, 0, 19, 20296, 50, 0,   0, 0, 0, 0, 'Drijya - Script9 - Set Data'),
+(20281*100+2, 9, 2, 0, 0, 0, 100, 1, 10000, 10000, 0, 0, 45, 1, 3, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set Data'),
+(20281*100+2, 9, 3, 0, 0, 0, 100, 1, 10000, 10000, 0, 0, 45, 1, 3, 0, 0, 0, 0, 19, 20296, 50, 0, 0, 0, 0, 0, 'Drijya - Script9 - Set Data'),
+(20296, 0, 0, 1, 38, 0, 100, 0, 1, 1, 0, 0, 11, 34602, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Teleporter Explosion Trigger - On Data Set - Cast Spell'),
+(20296, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 56274, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Teleporter Explosion Trigger - On Data Set - Cast Spell'),
+(20296, 0, 2, 0, 38, 0, 100, 0, 1, 2, 0, 0, 11, 35142, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Teleporter Explosion Trigger - On Data Set - Cast Spell'),
+(20296, 0, 3, 0, 38, 0, 100, 0, 1, 3, 0, 0, 11, 35145, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Teleporter Explosion Trigger - On Data Set - Cast Spell'),
+(20296, 0, 4, 0, 38, 0, 100, 0, 1, 4, 0, 0, 11, 35146, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Teleporter Explosion Trigger - On Data Set - Cast Spell'),
+(20399, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 20281, 80, 0, 0, 0, 0, 0, 'Terror ImpJust summoned  - Start attack'),
+(20402, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 20281, 80, 0, 0, 0, 0, 0, 'Legion Shocktrooper - Just summoned  - Start attack'),
+(20402, 0, 1, 0, 1, 0, 100, 0, 2000, 8000, 10000, 17000, 11, 35144, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Legion Shocktrooper - IC - Cast Vicious Rend'),
+(20403, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 20281, 80, 0, 0, 0, 0, 0, 'Just summoned  - Start attack'),
+(20403, 0, 1, 0, 0, 0, 100, 0, 2000, 8000, 7000, 10000, 11, 13737, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Legion Destroyer - IC - Cast Mortal Strike'),
+(20403, 0, 2, 0, 0, 0, 100, 0, 2000, 5000, 9000, 13000, 11, 11428, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Legion Destroyer - IC  - Cast Knockdown');
+
+DELETE FROM `waypoints` WHERE `entry`=20281;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(20281, 1, 3101.25, 2800.1, 118.565, 'Drijya'),
+(20281, 2, 3107.59, 2793.75, 117.902, 'Drijya'),
+(20281, 3, 3095.54, 2771.74, 115.836, 'Drijya'),
+(20281, 4, 3086.593, 2752.232,115.499, 'Drijya'),
+(20281, 5, 3077.952, 2745.1616, 116.63, 'Drijya'),
+(20281, 6, 3050.38, 2727.86, 114.118, 'Drijya'),
+(20281, 7, 3056.46, 2723.47, 113.688, 'Drijya'),
+(20281, 8, 3041.73, 2711.97, 114.028, 'Drijya'),
+(20281, 9, 3021.78, 2700.04, 114.08, 'Drijya'),
+(20281, 10, 3013.88, 2708.98, 113.785, 'Drijya'),
+(20281, 11, 3002, 2718.44, 113.769, 'Drijya'),
+(20281, 12, 3009.91, 2728.669, 114.377, 'Drijya'),
+(20281, 13, 3017.120, 2729.377, 113.76, 'Drijya'),
+(20281, 14, 3086.263, 2764.139, 115.84, 'Drijya'),
+(20281, 15, 3100.599, 2794.43, 117.958, 'Drijya'),
+(20281, 16, 3096.169, 2801.14, 118.221, 'Drijya');
diff --git a/sql/updates/world/master/2018_03_17_14_world_2016_12_26_01_world.sql b/sql/updates/world/master/2018_03_17_14_world_2016_12_26_01_world.sql
new file mode 100644
index 000000000..b8fa54065
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_14_world_2016_12_26_01_world.sql
@@ -0,0 +1,57 @@
+-- 
+-- "Swamp Eye" Jarl - Creepy Event -- https://ironyca.wordpress.com/2010/09/15/the-10-most-creepy-things-in-wow/ 
+-- Mordant Grimsby SAI
+SET @ENTRY := 23843;
+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,25,0,100,0,0,0,0,0,53,0,23843,1,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,1,23843,0,0,54,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,2,23843,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Waypoint 2 Reached - Remove Npc Flag Questgiver"),
+(@ENTRY,0,3,0,40,0,100,0,6,23843,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Waypoint 6 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,10,23843,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Waypoint 10 Reached - Add Npc Flag Questgiver"),
+(@ENTRY,0,5,0,40,0,100,0,11,23843,0,0,54,300000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Waypoint 11 Reached - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 2384300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,54000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,3000,3000,0,0,5,381,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Play Emote 381"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,50,186418,45,0,0,0,0,8,0,0,0,-2954.89,-3883.94,32.9969,2.60053,"Mordant Grimsby - On Script - Summon Gameobject 'Mordant's Gift'"),
+(@ENTRY,9,3,0,0,0,100,0,2000,2000,0,0,5,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Play Emote 0"),
+(@ENTRY,9,4,0,0,0,100,0,2000,2000,0,0,1,0,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 0"),
+(@ENTRY,9,5,0,0,0,100,0,4000,4000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 1"),
+(@ENTRY,9,6,0,0,0,100,0,5000,5000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 2"),
+(@ENTRY,9,7,0,0,0,100,0,6000,6000,0,0,1,0,5000,0,0,0,0,19,4792,20,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 0"),
+(@ENTRY,9,8,0,0,0,100,0,5000,5000,0,0,1,3,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 3"),
+(@ENTRY,9,9,0,0,0,100,0,6000,6000,0,0,1,1,5000,0,0,0,0,19,4792,20,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 1"),
+(@ENTRY,9,10,0,0,0,100,0,5000,5000,0,0,1,4,8000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 4"),
+(@ENTRY,9,11,0,0,0,100,0,8000,8000,0,0,5,381,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Play Emote 381");
+
+DELETE FROM `waypoints` WHERE `entry`=23843;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(23843, 1, -2948.36, -3893.17, 35.0324,  'Mordant Grimsby'),
+(23843, 2, -2954, -3888.35, 34.991,      'Mordant Grimsby'),
+(23843, 3, -2955.8, -3887.22, 33.729,    'Mordant Grimsby'),
+(23843, 4, -2957.36, -3885.06, 33.0995,  'Mordant Grimsby'),
+(23843, 5, -2957.23, -3882.92, 32.7325,  'Mordant Grimsby'),
+(23843, 6, -2955.98, -3882.95, 32.8433,  'Mordant Grimsby'),
+(23843, 7, -2955.55, -3885.08, 33.1672,  'Mordant Grimsby'),
+(23843, 8, -2953.84, -3885.88, 33.9242,  'Mordant Grimsby'),
+(23843, 9, -2952.99, -3887.91, 35.0223,  'Mordant Grimsby'),
+(23843, 10, -2947.74, -3893.74, 35.0308, 'Mordant Grimsby'),
+(23843, 11, -2948.36, -3893.17, 35.0324, 'Mordant Grimsby');
+
+-- Texts
+DELETE FROM `creature_text` WHERE `CreatureID` IN(23843, 4792);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+-- Mordant Grimsby
+(23843, 0, 0, 'I brought you a housewarming gift, Jarl.', 12, 0, 100, 1, 0, 0, 22348, 'Mordant Grimsby'),
+(23843, 1, 0, 'Go on, open it. I think you\'ll like it.', 12, 0, 100, 25, 0, 0, 22349, 'Mordant Grimsby'),
+(23843, 2, 0, 'Jarl?', 12, 0, 100, 0, 0, 0, 22350, 'Mordant Grimsby'),
+(23843, 3, 0, 'Jarl, you haven\'t been yourself ever since I arrived. What\'s going on?', 12, 0, 100, 1, 0, 0, 22352, 'Mordant Grimsby'),
+(23843, 4, 0, 'I came out here to visit you, Jarl! And I find you living in an empty cabin in the middle of nowhere, babbling about frogs? You\'re hopeless!', 12, 0, 100, 5, 0, 0, 22354, 'Mordant Grimsby'),
+-- "Swamp Eye" Jarl
+(4792, 0, 0, 'Unless it\'s something I can eat, I don\'t want it.', 12, 0, 100, 6, 0, 0, 22351, '"Swamp Eye" Jarl'),
+(4792, 1, 0, 'Nothing. Wanna help me whip up some frog leg stew?', 12, 0, 100, 1, 0, 0, 22353, '"Swamp Eye" Jarl');
diff --git a/sql/updates/world/master/2018_03_17_15_world_2016_12_26_03_world.sql b/sql/updates/world/master/2018_03_17_15_world_2016_12_26_03_world.sql
new file mode 100644
index 000000000..178038a3f
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_15_world_2016_12_26_03_world.sql
@@ -0,0 +1,19 @@
+-- 
+-- [Q] Gamel the Cruel -- http://wotlk.openwow.com/quest=11619
+-- Karuk SAI
+SET @ENTRY := 25435;
+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,20,0,100,0,11619,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Karuk - On Quest 'Gamel the Cruel' Finished - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2543500;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,12,26450,1,15000,0,0,0,8,0,0,0,2003.83,5851.17,36.2061,2.75762,"Karuk - On Script - Summon Creature 'Ariut'"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,1,0,10000,0,0,0,0,19,26450,20,0,0,0,0,0,"Karuk - On Script - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=26450;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(26450, 0, 0, 'The fallen of Pal\'ea will not rest, son.  Find the naga priestess!', 12, 0, 100, 1, 0, 0, 25684, 'Ariut');
diff --git a/sql/updates/world/master/2018_03_17_16_world_2016_12_26_04_world.sql b/sql/updates/world/master/2018_03_17_16_world_2016_12_26_04_world.sql
new file mode 100644
index 000000000..931fc89b8
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_16_world_2016_12_26_04_world.sql
@@ -0,0 +1,18 @@
+-- 
+-- Actionlist SAI
+SET @ENTRY := 2384300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,54000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,3000,3000,0,0,5,381,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Play Emote 381"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,50,186418,45,0,0,0,0,8,0,0,0,-2954.89,-3883.94,32.9969,2.60053,"Mordant Grimsby - On Script - Summon Gameobject Mordant's Gift"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,19,4792,20,0,0,0,0,0,"Mordant Grimsby - On Script - Set Orientation Closest Creature Swamp Eye Jarl"),
+(@ENTRY,9,4,0,0,0,100,0,2000,2000,0,0,5,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Play Emote 0"),
+(@ENTRY,9,5,0,0,0,100,0,2000,2000,0,0,1,0,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 0"),
+(@ENTRY,9,6,0,0,0,100,0,4000,4000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 1"),
+(@ENTRY,9,7,0,0,0,100,0,5000,5000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 2"),
+(@ENTRY,9,8,0,0,0,100,0,6000,6000,0,0,1,0,5000,0,0,0,0,19,4792,20,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 0"),
+(@ENTRY,9,9,0,0,0,100,0,5000,5000,0,0,1,3,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 3"),
+(@ENTRY,9,10,0,0,0,100,0,6000,6000,0,0,1,1,5000,0,0,0,0,19,4792,20,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 1"),
+(@ENTRY,9,11,0,0,0,100,0,5000,5000,0,0,1,4,8000,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Say Line 4"),
+(@ENTRY,9,12,0,0,0,100,0,8000,8000,0,0,5,381,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordant Grimsby - On Script - Play Emote 381");
diff --git a/sql/updates/world/master/2018_03_17_17_world_2016_12_26_05_world.sql b/sql/updates/world/master/2018_03_17_17_world_2016_12_26_05_world.sql
new file mode 100644
index 000000000..a07a350a9
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_17_world_2016_12_26_05_world.sql
@@ -0,0 +1,18 @@
+-- 
+-- [Q] Strange Brew -- http://wotlk.openwow.com/quest=10511
+-- Borgrim Stouthammer SAI
+SET @ENTRY := 21151;
+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,20,0,100,0,10511,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Borgrim Stouthammer - On Quest 'Strange Brew' Finished - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2115100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,5000,5000,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Borgrim Stouthammer - On Script - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=21151;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(21151, 0, 0, 'ACK! That''s the worst thing I''ve ever tasted! I wouldn''t let my ram drink that!', 12, 0, 100, 1, 0, 0, 18830, 'Borgrim Stouthammer');
diff --git a/sql/updates/world/master/2018_03_17_18_world_2016_12_26_06_world.sql b/sql/updates/world/master/2018_03_17_18_world_2016_12_26_06_world.sql
new file mode 100644
index 000000000..7ad43549c
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_18_world_2016_12_26_06_world.sql
@@ -0,0 +1,79 @@
+DELETE FROM `smart_scripts` WHERE `entryorguid`=28747 AND `source_type`=0 AND `id`=8;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=28748 AND `source_type`=0 AND `id`=7;
+
+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
+(28747, 0, 8, 0, 7, 0, 100, 512, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Quetz\'lun Worshipper - On Evade - Turn Invincibility off'),
+(28748, 0, 7, 0, 7, 0, 100, 512, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Serpent-Touched Berserker - On Evade - Turn Invincibility off');
+
+UPDATE `smart_scripts` SET `link`=1,`event_flags`=513 WHERE  `entryorguid`IN(25397,25398,25399) AND `source_type`=0 AND `id`=0 AND `link`=0;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`IN(25397,25398,25399) AND `source_type`=0 AND `id`>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
+(25397, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 11, 33345, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Kesuk - On Spellhit \'Complete Ancestor Ritual\' - Cast Yellow Banish State '),
+(25397, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 3, 0, 28320, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Kesuk - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid '),
+(25397, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 114, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 18, 0, 'Elder Kesuk - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid '),
+(25397, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 5000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Kesuk - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid '),
+(25398, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 11, 33345, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Sagani - On Spellhit \'Complete Ancestor Ritual\' - Cast Yellow Banish State '),
+(25398, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 3, 0, 28320, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Sagani - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid '),
+(25398, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 114, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 18, 0, 'Elder Sagani - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid '),
+(25398, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 5000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Sagani - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid '),
+(25399, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 11, 33345, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Takret - On Spellhit \'Complete Ancestor Ritual\' - Cast Yellow Banish State '),
+(25399, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 3, 0, 28320, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Takret - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid '),
+(25399, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 114, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 18, 0, 'Elder Takret - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid '),
+(25399, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 5000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Elder Takret - On Spellhit \'Complete Ancestor Ritual\' - Change Modelid ');
+
+UPDATE `creature` SET `spawntimesecs`=30 WHERE  `id`IN(25397,25398,25399);
+UPDATE `creature_template` SET `InhabitType`=4 WHERE  `entry` IN(25397,25398,25399);
+
+UPDATE `quest_template_addon` SET `PrevQuestID`=871 WHERE  `ID`=872;
+
+SET @BreadCrumb   := 1061;  -- The Spirits of Stonetalon
+SET @FirstQuest   := 1062;  -- Goblin Invaders
+
+UPDATE `quest_template_addon` SET `PrevQuestID` =0 WHERE `ID`=@FirstQuest;
+UPDATE `quest_template_addon` SET `NextQuestID` =0 WHERE `ID`=@BreadCrumb;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) AND `SourceEntry`=@BreadCrumb AND `ConditionTypeOrReference`=14 AND `ConditionValue1`=@FirstQuest;
+
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19, 0, @BreadCrumb, 0, 0, 14, 0, @FirstQuest, 0, 0, 0, 0, 0, '', 'Optional BreadCrumb Quest'),
+(20, 0, @BreadCrumb, 0, 0, 14, 0, @FirstQuest, 0, 0, 0, 0, 0, '', 'Optional BreadCrumb Quest');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) AND `SourceEntry`IN(12451,12161,12425);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19, 0, 12451, 0, 0, 14, 0, 12195, 0, 0, 0, 0, 0, '', 'Onward to Camp Oneqwah is optional BreadCrumb Quest'),
+(20, 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'),
+(20, 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'),
+(20, 0, 12425, 0, 0, 14, 0, 12328, 0, 0, 0, 0, 0, '', 'Ruuna the Blind is optional BreadCrumb Quest');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) AND `SourceEntry`IN(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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 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'),
+(20, 0, 12210, 0, 0, 14, 0, 11984, 0, 0, 0, 0, 0, '', 'Troll Season! is optional BreadCrumb Quest');
+
+
diff --git a/sql/updates/world/master/2018_03_17_19_world_2016_12_26_07_world.sql b/sql/updates/world/master/2018_03_17_19_world_2016_12_26_07_world.sql
new file mode 100644
index 000000000..727ee3780
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_19_world_2016_12_26_07_world.sql
@@ -0,0 +1 @@
+UPDATE `quest_template_addon` SET `NextQuestID`=0 WHERE  `ID`IN(12451,12161,12425,11175,11406,12182,12189,11573,11995,12469,12542,11996,12511,12208,12210);
diff --git a/sql/updates/world/master/2018_03_17_20_world_2016_12_27_00_world.sql b/sql/updates/world/master/2018_03_17_20_world_2016_12_27_00_world.sql
new file mode 100644
index 000000000..b5fa4248a
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_20_world_2016_12_27_00_world.sql
@@ -0,0 +1,7 @@
+-- 
+-- Highlord Bolvar Fordragon SAI
+SET @ENTRY := 27872;
+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,20,0,100,0,12499,0,0,0,68,14,0,0,0,0,0,7,0,0,0,0,0,0,0,"Highlord Bolvar Fordragon - On Quest 'Return To Angrathar' Finished - Play Movie 14");
diff --git a/sql/updates/world/master/2018_03_17_21_world_2016_12_27_02_world.sql b/sql/updates/world/master/2018_03_17_21_world_2016_12_27_02_world.sql
new file mode 100644
index 000000000..de3238f17
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_21_world_2016_12_27_02_world.sql
@@ -0,0 +1,3 @@
+-- 
+UPDATE `creature` SET `PhaseId` = 170 WHERE `guid` IN (110540,110541,110544,110545,110546,110547,110551,110552,110553,110554);
+UPDATE `creature_addon` SET `bytes1`=1 WHERE  `guid`=111075;
diff --git a/sql/updates/world/master/2018_03_17_22_world_2016_12_27_07_world.sql b/sql/updates/world/master/2018_03_17_22_world_2016_12_27_07_world.sql
new file mode 100644
index 000000000..bcffbf8e6
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_22_world_2016_12_27_07_world.sql
@@ -0,0 +1,2 @@
+-- 
+DELETE FROM `creature_loot_template` WHERE `Entry`=11444 AND `Reference`=35015;
diff --git a/sql/updates/world/master/2018_03_17_23_world_2016_12_27_08_world.sql b/sql/updates/world/master/2018_03_17_23_world_2016_12_27_08_world.sql
new file mode 100644
index 000000000..d880657f8
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_23_world_2016_12_27_08_world.sql
@@ -0,0 +1,23 @@
+DELETE FROM `creature_equip_template` WHERE  `CreatureID`=794 AND `ID`=1;
+INSERT INTO `creature_equip_template` (`CreatureID`, `ItemID1`) VALUES
+(794, 1117);
+
+-- Matt SAI
+SET @ENTRY := 794;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100+00,@ENTRY*100+01) 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
+(@ENTRY,0,0,0,25,0,100,512,0,0,0,0,53,0,794,1,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,512,1,794,0,0,54,3597000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,512,1,794,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Waypoint 1 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,512,26,794,0,0,54,900000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Waypoint 26 Reached - Pause Waypoint"),
+(@ENTRY,0,4,0,40,0,100,512,26,794,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Waypoint 26 Reached - Run Script"),
+(@ENTRY*100+00,9,0,0,0,0,100,0,0,0,0,0,71,1,0,1117,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Change Equipment"),
+(@ENTRY*100+00,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,-9387.45,-117.388,58.8643,2.61799,"Matt - On Script - Set Orientation 2,61799"),
+(@ENTRY*100+00,9,2,0,0,0,100,0,3597000,3597000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Say Line 0"),
+(@ENTRY*100+00,9,3,0,0,0,100,0,0,0,0,0,71,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Change Equipment"),
+(@ENTRY*100+01,9,0,0,0,0,100,0,0,0,0,0,71,1,0,1117,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Change Equipment"),
+(@ENTRY*100+01,9,1,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,8,0,0,0,-9429.23,148.94,56.5713,2.118,"Matt - On Script - Set Orientation 2,118"),
+(@ENTRY*100+01,9,2,0,0,0,100,0,897000,897000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Say Line 1"),
+(@ENTRY*100+01,9,3,0,0,0,100,0,0,0,0,0,71,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Matt - On Script - Change Equipment");
diff --git a/sql/updates/world/master/2018_03_17_24_world_2016_12_27_09_world.sql b/sql/updates/world/master/2018_03_17_24_world_2016_12_27_09_world.sql
new file mode 100644
index 000000000..31d56d7cd
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_24_world_2016_12_27_09_world.sql
@@ -0,0 +1,115 @@
+-- Showdown (10742)
+-- Showdown (10806)
+
+DELETE FROM `creature_template_addon` WHERE `entry`=22448;
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` IN(22496, 20555));
+DELETE FROM `creature` WHERE `id` IN(22496, 20555);
+DELETE FROM `waypoint_data` WHERE `id`=868810;
+
+DELETE FROM `event_scripts` WHERE `id` IN(14462, 14525);
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
+(14462, 0, 10, 20555, 300000, 0, 3703.51, 5387.74, -4.37, 5.9),
+(14462, 0, 10, 22448, 300000, 0, 3688, 5353, 25, 0),
+(14525, 0, 10, 20555, 300000, 0, 3703.51, 5387.74, -4.37, 5.9),
+(14525, 0, 10, 22473, 300000, 0, 3718.36, 5361.27, -8.0, 2.14);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (39224,39223);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17, 0, 39224, 0, 0, 29, 0, 20555, 100, 0, 1, 0, 0, '', 'Require no Goc nearby'),
+(17, 0, 39223, 0, 0, 29, 0, 20555, 100, 0, 1, 0, 0, '', 'Require no Goc nearby');
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (20555, 22473, 22448);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(20555, 0, 0, 'Who dares place this affront upon the altar of Goc?', 14, 0, 100, 53, 0, 0, 20381, 'Goc'),
+(20555, 1, 0, 'Who dares rouse Goc from his restful slumber?', 14, 0, 100, 53, 0, 0, 20317, 'Goc'),
+(20555, 2, 0, 'Your name is as insignificant to me as the names of the thousands who have died under the might of Goc. I will crush you and $N', 14, 0, 100, 53, 0, 0, 20321, 'Goc'),
+(22473, 0, 0, 'It''s only right that you know the name of the one who will take your life.', 14, 0, 100, 1, 0, 0, 20323, 'Baron Sablemane'),
+(22473, 1, 0, 'Baron Sablemane. It will be on your lips as you gasp your dying breath.', 14, 0, 100, 1, 0, 0, 20324, 'Baron Sablemane'),
+(22473, 2, 0, 'Let us begin.', 14, 0, 100, 15, 0, 0, 20325, 'Baron Sablemane'),
+(22473, 3, 0, 'We will speak again, but away from here.', 14, 0, 100, 1, 0, 0, 20327, 'Baron Sablemane'),
+(22448, 0, 0, 'I am Rexxar, son of the Mok''Nathal, champion of the Horde.', 14, 0, 100, 397, 0, 0, 20318, 'Rexxar'),
+(22448, 1, 0, 'And their torment at your hands is at an end. By my name, I shall put an end to your life.', 14, 0, 100, 113, 0, 0, 20319, 'Rexxar'),
+(22448, 2, 0, 'Prepare yourself for the end.', 14, 0, 100, 15, 0, 0, 20320, 'Rexxar'),
+(22448, 3, 0, 'I could not have achieved this victory without you. We will speak back at Thunderlord Stronghold.', 14, 0, 100, 397, 0, 0, 20326, 'Rexxar');
+
+UPDATE `creature_template` SET `InhabitType`=5, `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=22448;
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (22473,20555);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (20555,22473,22448) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(22473*100, 22473*100+1, 22448*100, 22448*100+1) 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
+(20555, 0, 0, 0, 38, 0, 100, 0, 1, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 22448, 100, 0, 0, 0, 0, 0, 'Goc - On Data Set - Set Orientation'),
+(20555, 0, 1, 0, 38, 0, 100, 0, 1, 1, 0, 0, 1, 2, 0, 0, 0, 0, 0, 21, 100, 0, 0, 0, 0, 0, 0, 'Goc - On Data Set - Say Line 2'),
+(20555, 0, 2, 9, 38, 0, 100, 0, 1, 2, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 100, 0, 0, 0, 0, 0, 0, 'Goc - On Data Set - Attack Start'),
+(20555, 0, 3, 0, 6, 0, 100, 0, 0, 0, 0, 0, 11, 45106, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Goc - On Death - Cast Showdown: Goc Kill Credit'),
+(20555, 0, 4, 0, 7, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Goc - On Evade - Despawn'),
+(20555, 0, 5, 0, 0, 0, 100, 0, 9000, 12000, 11000, 15000, 11, 38784, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Goc - In Combat - Cast Ground Smash'),
+(20555, 0, 6, 0, 0, 0, 100, 0, 3000, 6000, 11000, 15000, 11, 38783, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Goc - In Combat - Cast Boulder Volley'),
+(20555, 0, 7, 8, 25, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Goc - On Reset - Set Unit Flags'),
+(20555, 0, 8, 0, 61, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Goc - On Reset - Set React Passive'),
+(20555, 0, 9, 10, 61, 0, 100, 0, 0, 0, 0, 0, 19, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Goc - Dataset - Remove Unit Flags'),
+(20555, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Goc - Dataset - Set React Aggressive'),
+(20555, 0, 11, 0, 38, 0, 100, 0, 1, 3, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 22473, 100, 0, 0, 0, 0, 0, 'Goc - On Data Set - Set Orientation'),
+(20555, 0, 12, 0, 2, 0, 100, 1, 0, 50, 0, 0, 45, 0, 1, 0, 0, 0, 0, 19, 22473, 60 , 0, 0, 0, 0, 0, "Goc - On health ptc - Set data"),
+(22473, 0, 0, 0, 37, 0, 100, 257, 0, 0, 0, 0, 80, 22473*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Start Script'),
+(22473, 0, 1, 0, 7, 0, 100, 257, 0, 0, 0, 0, 80, 22473*100+1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Evade - Start Script'),
+(22473, 0, 2, 0, 0, 1, 100, 0, 0, 1000, 3000, 3000, 11, 17290, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - In Combat - Cast Fireball'),
+(22473, 0, 3, 0, 0, 1, 100, 0, 4000, 7000, 11000, 20000, 11, 39268, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - In Combat - Cast Chains of Ice'),
+(22473*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Set Unit Flags'),
+(22473*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 41232, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Cast Teleport Visual Only'),
+(22473*100, 9, 2, 0, 0, 0, 100, 0, 500, 500, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Say Line 1 Target'),
+(22473*100, 9, 3, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Say Line 0'),
+(22473*100, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 45, 1, 3, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Set Data'),
+(22473*100, 9, 5, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Say Line 1'),
+(22473*100, 9, 6, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Set Data'),
+(22473*100, 9, 7, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Say Line 1'),
+(22473*100, 9, 8, 0, 0, 0, 100, 0, 500, 500, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Set Data'),
+(22473*100, 9, 9, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 19, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Remove unitflag'),
+(22473*100, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Start attack'),
+(22473*100, 9, 11, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - In spell hit - Set event phase 1'),
+(22473*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - demorph'),
+(22473*100+1, 9, 1, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Say Line 3'),
+(22473*100+1, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 21, 50, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Orientation'),
+(22473*100+1, 9, 3, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 11, 41232, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Cast Teleport Visual Only'),
+(22473*100+1, 9, 4, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - On Update - Despawn'),
+(22473, 0, 6, 5, 38, 0, 100, 0, 0, 1, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - In data set - Set event phase 2'),
+(22473, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 39255, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - In Data set - Cast Black Dragon Form'),
+(22473, 0, 6, 7, 8, 0, 100, 1, 39255, 0, 0, 0, 3, 0, 21079, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - In spell hit - morph'),
+(22473, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - In spell hit - Allow movements'),
+(22473, 0, 8, 0, 0, 2, 100, 0, 7000, 9000, 9000, 12000, 11, 39263, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - In Combat - Flame Breath'),
+(22473, 0, 9, 0, 0, 2, 100, 1, 5000, 5000, 0, 0, 3, 0, 21079, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Baron Sablemane - IC Phase2 no repeat - morph in case the spell hit fails'),
+(22448, 0, 0, 1, 37, 0, 100, 257, 0, 0, 0, 0, 43, 0 , 20964, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On AI Init - mount'),
+(22448, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 60, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On AI Init - Set Flying'), 
+(22448, 0, 2, 0, 60, 0, 100, 257, 0, 0, 0, 0, 80, 22448*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Start Script'),
+(22448, 0, 3, 0, 7, 0, 100, 257, 0, 0, 0, 0, 80, 22448*100+1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Evade - Start Script'),
+(22448, 0, 4, 0, 0, 0, 100, 1, 4000, 4000, 0, 0, 11, 39269, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - In Combat - Cast Summon Misha'),
+(22448, 0, 5, 0, 0, 0, 100, 1, 16000, 16000, 0, 0, 11, 39251, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - In Combat - Cast Summon Huffer'),
+(22448, 0, 6, 0, 0, 0, 100, 1, 30000, 30000, 0, 0, 11, 39253, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - In Combat - Cast Summon Spirit'),
+(22448*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Unit Flags'),
+(22448*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 27, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Emote State'),
+(22448*100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 0, 8, 0, 0, 0, 3718.36, 5361.27, -6.5, 0, 'Rexxar - On Update - Move to Point'),
+(22448*100, 9, 3, 0, 0, 0, 100, 0, 2500, 2500, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Say Line 0 Target'),
+(22448*100, 9, 4, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 43, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Dismount'),
+(22448*100, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 91, 2 , 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Remove hover'),
+(22448*100, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Fly off'),
+(22448*100, 9, 7, 0, 0, 0, 100, 0, 500, 500, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Orientation'),
+(22448*100, 9, 8, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Say Line 0'),
+(22448*100, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Data'),
+(22448*100, 9, 10, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Say Line 1'),
+(22448*100, 9, 11, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Data'),
+(22448*100, 9, 12, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Say Line 2'),
+(22448*100, 9, 13, 0, 0, 0, 100, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Home Position'),
+(22448*100, 9, 14, 0, 0, 0, 100, 0, 500, 500, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Data'),
+(22448*100, 9, 15, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 19, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Remove Unit Flags'),
+(22448*100, 9, 16, 0, 0, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 20555, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Attack Start'),
+(22448*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 19, 22492, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Despawn Target'),
+(22448*100+1, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 19, 22498, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Despawn Target'),
+(22448*100+1, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 19, 22490, 100, 0, 0, 0, 0, 0, 'Rexxar - On Update - Despawn Target'),
+(22448*100+1, 9, 3, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Say Line 3'),
+(22448*100+1, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 21, 50, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set Orientation'),
+(22448*100+1, 9, 5, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 43, 0, 20964, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Mount'),
+(22448*100+1, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Set run'),
+(22448*100+1, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 34873, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Cast fly'),
+(22448*100+1, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 39333, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Cast Rexxar Speed Increase'),
+(22448*100+1, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 2, 0, 0, 0, 0, 0, 8, 0, 0, 0, 3625, 5468, 104, 0, 'Rexxar - On Update - Move To Position'),
+(22448*100+1, 9, 10, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Rexxar - On Update - Despawn');
diff --git a/sql/updates/world/master/2018_03_17_25_world_2016_12_27_05_world.sql b/sql/updates/world/master/2018_03_17_25_world_2016_12_27_05_world.sql
new file mode 100644
index 000000000..5cd248ebf
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_25_world_2016_12_27_05_world.sql
@@ -0,0 +1,100 @@
+-- Fix position
+UPDATE `creature` SET `position_x` = -533.573547, `position_y` = -2984.998291, `position_z` = 92.891449 WHERE `guid` = 302320;
+
+-- Gruk SAI
+SET @ENTRY := 14850;
+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,25,0,100,0,0,0,0,0,53,0,14850,1,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,2,8000,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Waypoint 2 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,4,14850,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Waypoint 4 Reached - Pause Waypoint"),
+(@ENTRY,0,3,0,40,0,100,0,10,14850,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Waypoint 10 Reached - Pause Waypoint"),
+(@ENTRY,0,4,0,40,0,100,0,16,14850,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Waypoint 16 Reached - Run Script"),
+(@ENTRY,0,5,0,40,0,100,0,21,14850,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Waypoint 21 Reached - Pause Waypoint"),
+(@ENTRY,0,6,0,40,0,100,0,27,14850,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Waypoint 27 Reached - Run Script"),
+(@ENTRY,0,7,0,40,0,100,0,29,14850,0,0,54,120000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Waypoint 29 Reached - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1485000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,14859,30,0,0,0,0,0,"Gruk - On Script - Set Orientation Closest Creature 'Guard Taruc'"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,5000,5000,0,0,1,0,4000,0,0,0,0,19,14859,30,0,0,0,0,0,"Gruk - On Script - Say Line 0"),
+(@ENTRY,9,4,0,0,0,100,0,4000,4000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Script - Say Line 1");
+
+-- Actionlist SAI
+SET @ENTRY := 1485001;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,12000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,14859,30,0,0,0,0,0,"Gruk - On Script - Set Orientation Closest Creature 'Guard Taruc'"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,1,2,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Script - Say Line 2"),
+(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,1,1,5000,0,0,0,0,19,14859,30,0,0,0,0,0,"Gruk - On Script - Say Line 1"),
+(@ENTRY,9,4,0,0,0,100,0,5000,5000,0,0,1,3,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Gruk - On Script - Say Line 3");
+
+DELETE FROM `waypoints` WHERE `entry`=14850;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(14850,1,-533.573547,-2984.998291,92.891449,    'Gruk'),
+(14850,2,-532.475403,-2982.788330,92.937279,    'Gruk'),
+(14850,3,-535.363220,-2986.683350,92.872704,    'Gruk'),
+(14850,4,-542.794800,-2987.175781,92.978973,    'Gruk'),
+(14850,5,-539.589355,-2979.670410,93.142120,    'Gruk'),
+(14850,6,-540.856995,-2972.263428,93.218491,    'Gruk'),
+(14850,7,-542.508789,-2968.742188,91.666573,    'Gruk'),
+(14850,8,-556.491699,-2958.448730,91.808884,    'Gruk'),
+(14850,9,-560.313782,-2959.109131,91.671059,    'Gruk'),
+(14850,10,-563.526733,-2961.728027,91.670532,   'Gruk'),
+(14850,11,-554.859009,-2957.945313,91.988205,   'Gruk'),
+(14850,12,-542.145020,-2969.399414,91.667198,   'Gruk'),
+(14850,13,-541.034119,-2970.875977,92.783127,   'Gruk'),
+(14850,14,-540.202698,-2974.504883,93.244942,   'Gruk'),
+(14850,15,-538.437439,-2986.249268,92.934875,   'Gruk'),
+(14850,16,-534.473755,-2989.052246,92.933678,   'Gruk'),
+(14850,17,-537.863098,-2989.072754,92.941650,   'Gruk'),
+(14850,18,-541.218079,-2972.432129,93.217178,   'Gruk'),
+(14850,19,-542.573792,-2969.562012,91.666840,   'Gruk'),
+(14850,20,-555.276855,-2959.603027,91.810295,   'Gruk'),
+(14850,21,-557.442505,-2961.866943,91.666817,   'Gruk'),
+(14850,22,-549.292786,-2960.807861,91.770721,   'Gruk'),
+(14850,23,-541.476624,-2969.215576,91.667030,   'Gruk'),
+(14850,24,-540.882019,-2970.607422,92.726028,   'Gruk'),
+(14850,25,-540.170898,-2974.454590,93.247406,   'Gruk'),
+(14850,26,-538.799744,-2988.168457,92.916451,   'Gruk'),
+(14850,27,-534.022583,-2988.809082,92.925842,   'Gruk'),
+(14850,28,-535.851135,-2988.203857,92.910934,   'Gruk'),
+(14850,29,-537.077087,-2984.784668,92.954727,   'Gruk');
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (14850, 14859);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+-- Gruk
+(14850, 0, 0, 'Would you like something more to eat sir?', 12, 0, 100, 1, 0, 0, 10066, 'Gruk'),
+(14850, 1, 0, 'Right away sir.', 12, 0, 100, 1, 0, 0, 10267, 'Gruk'),
+(14850, 2, 0, 'Here is your bread sir.', 12, 0, 100, 1, 0, 0, 10184, 'Gruk'),
+(14850, 3, 0, 'As you wish sir.', 12, 0, 100, 1, 0, 0, 10266, 'Gruk'),
+-- Guard Taruc
+(14859, 0, 0, 'More bread boy!', 12, 0, 100, 1, 0, 0, 10183, 'Guard Taruc'),
+(14859, 1, 0, 'Aaahh... Very good. Now scat!', 12, 0, 100, 1, 0, 0, 10265, 'Guard Taruc');
+
+-- Grub SAI
+SET @ENTRY := 3443;
+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,1,0,100,0,8000,8000,8000,8000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grub - Out of Combat - Play Emote 1");
+
+-- Duhng SAI
+SET @ENTRY := 8306;
+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,1,0,100,0,8000,10000,8000,10000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Duhng - Out of Combat - Play Emote 1");
+
+-- Guard Taruc SAI
+SET @ENTRY := 14859;
+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,1,0,100,0,8000,9000,8000,9000,5,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Taruc - Out of Combat - Play Emote 7");
diff --git a/sql/updates/world/master/2018_03_17_26_world_2016_12_27_10_world.sql b/sql/updates/world/master/2018_03_17_26_world_2016_12_27_10_world.sql
new file mode 100644
index 000000000..714724a39
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_26_world_2016_12_27_10_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_skeram_true_fulfillment';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(785,'spell_skeram_true_fulfillment');
diff --git a/sql/updates/world/master/2018_03_17_27_world_2016_12_28_00_world.sql b/sql/updates/world/master/2018_03_17_27_world_2016_12_28_00_world.sql
new file mode 100644
index 000000000..3a5a8d4b3
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_27_world_2016_12_28_00_world.sql
@@ -0,0 +1,129 @@
+-- [Q] Totem of Vark -- http://wotlk.openwow.com/quest=9542
+-- this spell must be casted later in the spawnscript
+UPDATE `quest_template_addon` SET `SourceSpellID`=0 WHERE  `ID`=9542;
+
+-- Totem of Yor SAI
+SET @ENTRY := 17363;
+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,19,0,100,0,9542,0,0,0,12,17393,1,360000,0,0,0,8,0,0,0,-4637.05,-13067.3,-13.5973,0.26767,"Totem of Yor - On Quest 'Totem of Vark' Taken - Summon Creature 'Stillpine Ancestor Yor'");
+
+-- spawncondition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=17363;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,17363,0,0,29,0,17393,50,0,1,0,0,"","Totem of Yor - Do not summon Stillpine Ancestor Yor if creature is in 50 yards range");
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (30448, -30448, 30447);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES 
+(30448, 32213, 2, 'Shadow of the Forest - Shadow of the Forest SI DND'),
+(30447, 32213, 2, 'Shadow of the Forest - Shadow of the Forest SI DND'),
+(-30448, -32213, 0, 'Shadow of the Forest - Shadow of the Forest SI DND');
+
+-- Stillpine Ancestor Yor SAI
+SET @ENTRY := 17393;
+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,1,11,0,100,1,0,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Respawn - Run Script (No Repeat)"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,64,1,0,0,0,0,0,21,30,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Respawn - Store Targetlist (No Repeat)"),
+(@ENTRY,0,2,0,40,0,100,0,63,17393,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Waypoint 63 Reached - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 1739300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,3,0,17002,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Morph To Model 17002"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Cast 'Elemental Spawn-in'"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Set Orientation Stored Player"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,12,1,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Say Line 0"),
+(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4646.63,-13015.4,-1.38673,1.6751,"Stillpine Ancestor Yor - On Script - Move To Position"),
+(@ENTRY,9,5,0,0,0,100,0,13000,13000,0,0,11,30446,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Cast 'Yor Transform Furbolg DND'"),
+(@ENTRY,9,6,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4679.14,-12985,0.5803,1.93085,"Stillpine Ancestor Yor - On Script - Move To Position"),
+(@ENTRY,9,7,0,0,0,100,0,13000,13000,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Set Orientation Stored Player"),
+(@ENTRY,9,8,0,0,0,100,0,3000,3000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Say Line 1"),
+(@ENTRY,9,9,0,0,0,100,0,3000,3000,0,0,11,30448,0,0,0,0,0,12,1,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Cast 'Shadow of the Forest'"),
+(@ENTRY,9,10,0,0,0,100,0,1000,1000,0,0,11,30447,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Invoker Cast 'Shadow of the Forest'"),
+(@ENTRY,9,11,0,0,0,100,0,2000,2000,0,0,1,2,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Say Line 2"),
+(@ENTRY,9,12,0,0,0,100,0,5000,5000,0,0,53,1,17393,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Start Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1739301;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,3,5000,0,0,0,0,12,1,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Say Line 3"),
+(@ENTRY,9,1,0,0,0,100,0,3000,3000,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Cast 'Elemental Spawn-in'"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stillpine Ancestor Yor - On Script - Despawn Instant");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=17393;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(17393, 0, 0, '[Furbolg] Come, $n. Let us leave the water together, purified.', 12, 0, 100, 0, 0, 0, 13901, 'Stillpine Ancestor Yor'),
+(17393, 1, 0, '[Furbolg] We go now, together. We will seek Vark.', 12, 0, 100, 0, 0, 0, 13903, 'Stillpine Ancestor Yor'),
+(17393, 2, 0, '[Furbolg] Follow me to Vark.', 12, 0, 100, 0, 0, 0, 13907, 'Stillpine Ancestor Yor'),
+(17393, 3, 0, '[Furbolg] Hurry, $n. Vark awaits you.', 12, 0, 100, 0, 0, 0, 13927, 'Stillpine Ancestor Yor');
+
+DELETE FROM `waypoints` WHERE `entry`=17393;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(17393, 1, -4679.14,-12985,0.5803,       'Stillpine Ancestor Yor'),
+(17393, 2, -4680.61,-12963.3,2.66436,    'Stillpine Ancestor Yor'),
+(17393, 3, -4681.2,-12949.7,5.54,        'Stillpine Ancestor Yor'),
+(17393, 4, -4682.73,-12929.5,3.47035,    'Stillpine Ancestor Yor'),
+(17393, 5, -4667.73,-12909.8,1.50962,    'Stillpine Ancestor Yor'),
+(17393, 6, -4647.96,-12887.9,2.97161,    'Stillpine Ancestor Yor'),
+(17393, 7, -4639.09,-12877.2,4.9471,     'Stillpine Ancestor Yor'),
+(17393, 8, -4630.71,-12855.1,4.28118,    'Stillpine Ancestor Yor'),
+(17393, 9, -4620.17,-12829.9,6.06746,    'Stillpine Ancestor Yor'),
+(17393, 10, -4612,-12814,7.12509,        'Stillpine Ancestor Yor'),
+(17393, 11, -4601.96,-12795.7,3.27105,   'Stillpine Ancestor Yor'),
+(17393, 12, -4588.53,-12774.2,7.44323,   'Stillpine Ancestor Yor'),
+(17393, 13, -4575.77,-12760.8,6.10979,   'Stillpine Ancestor Yor'),
+(17393, 14, -4563.73,-12744.2,9.99685,   'Stillpine Ancestor Yor'),
+(17393, 15, -4554.96,-12729,12.2105,     'Stillpine Ancestor Yor'),
+(17393, 16, -4547.41,-12712.1,9.81412,   'Stillpine Ancestor Yor'),
+(17393, 17, -4538.2,-12689.2,12.5838,    'Stillpine Ancestor Yor'),
+(17393, 18, -4533.22,-12668.1,16.8651,   'Stillpine Ancestor Yor'),
+(17393, 19, -4532.96,-12656.8,15.2664,   'Stillpine Ancestor Yor'),
+(17393, 20, -4532.78,-12637.9,16.5789,   'Stillpine Ancestor Yor'),
+(17393, 21, -4533.02,-12619.1,12.0263,   'Stillpine Ancestor Yor'),
+(17393, 22, -4532.77,-12592.5,14.642,    'Stillpine Ancestor Yor'),
+(17393, 23, -4535.16,-12572.5,11.9603,   'Stillpine Ancestor Yor'),
+(17393, 24, -4521.38,-12547.2,8.20642,   'Stillpine Ancestor Yor'),
+(17393, 25, -4506.74,-12520.5,2.71515,   'Stillpine Ancestor Yor'),
+(17393, 26, -4492.57,-12495.4,4.36968,   'Stillpine Ancestor Yor'),
+(17393, 27, -4476.92,-12469.2,2.26036,   'Stillpine Ancestor Yor'),
+(17393, 28, -4462.38,-12438.4,2.68436,   'Stillpine Ancestor Yor'),
+(17393, 29, -4430.42,-12442,2.38524,     'Stillpine Ancestor Yor'),
+(17393, 30, -4419.91,-12429.3,3.2091,    'Stillpine Ancestor Yor'),
+(17393, 31, -4408.61,-12400.1,5.02559,   'Stillpine Ancestor Yor'),
+(17393, 32, -4414.42,-12370.4,5.99229,   'Stillpine Ancestor Yor'),
+(17393, 33, -4423.44,-12345,8.29463,     'Stillpine Ancestor Yor'),
+(17393, 34, -4435.58,-12315.7,10.3162,   'Stillpine Ancestor Yor'),
+(17393, 35, -4457.19,-12304.2,12.3064,   'Stillpine Ancestor Yor'),
+(17393, 36, -4475.24,-12294,13.9122,     'Stillpine Ancestor Yor'),
+(17393, 37, -4490.89,-12279.7,15.2792,   'Stillpine Ancestor Yor'),
+(17393, 38, -4503.42,-12249.6,16.3871,   'Stillpine Ancestor Yor'),
+(17393, 39, -4510.15,-12229.8,17.1362,   'Stillpine Ancestor Yor'),
+(17393, 40, -4513.27,-12209.5,16.9777,   'Stillpine Ancestor Yor'),
+(17393, 41, -4513.64,-12189.1,16.9593,   'Stillpine Ancestor Yor'),
+(17393, 42, -4502.99,-12158,16.1291,     'Stillpine Ancestor Yor'),
+(17393, 43, -4508.94,-12122.7,16.9898,   'Stillpine Ancestor Yor'),
+(17393, 44, -4505.31,-12095.6,18.8873,   'Stillpine Ancestor Yor'),
+(17393, 45, -4500.36,-12071.2,21.4168,   'Stillpine Ancestor Yor'),
+(17393, 46, -4516.81,-12050.5,24.2492,   'Stillpine Ancestor Yor'),
+(17393, 47, -4528.22,-12037.5,26.0347,   'Stillpine Ancestor Yor'),
+(17393, 48, -4531.9,-12008.6,28.4037,    'Stillpine Ancestor Yor'),
+(17393, 49, -4538.61,-11984.4,29.7635,   'Stillpine Ancestor Yor'),
+(17393, 50, -4543.79,-11963.5,29.1954,   'Stillpine Ancestor Yor'),
+(17393, 51, -4537.48,-11934.2,27.0094,   'Stillpine Ancestor Yor'),
+(17393, 52, -4533.18,-11906.3,22.686,    'Stillpine Ancestor Yor'),
+(17393, 53, -4504.71,-11879,17.5661,     'Stillpine Ancestor Yor'),
+(17393, 54, -4500.36,-11845.7,15.0063,   'Stillpine Ancestor Yor'),
+(17393, 55, -4510.63,-11816.8,13.8306,   'Stillpine Ancestor Yor'),
+(17393, 56, -4531.7,-11786.6,15.5384,    'Stillpine Ancestor Yor'),
+(17393, 57, -4555.94,-11756.9,17.6289,   'Stillpine Ancestor Yor'),
+(17393, 58, -4546.7,-11735.9,19.533,     'Stillpine Ancestor Yor'),
+(17393, 59, -4535.96,-11712.4,18.2368,   'Stillpine Ancestor Yor'),
+(17393, 60, -4519.88,-11702.4,17.8815,   'Stillpine Ancestor Yor'),
+(17393, 61, -4507,-11694.5,13.2184,      'Stillpine Ancestor Yor'),
+(17393, 62, -4490.14,-11673,10.8723,     'Stillpine Ancestor Yor'),
+(17393, 63, -4486.34,-11658,10.6353,     'Stillpine Ancestor Yor');
diff --git a/sql/updates/world/master/2018_03_17_28_world_2016_12_28_01_world.sql b/sql/updates/world/master/2018_03_17_28_world_2016_12_28_01_world.sql
new file mode 100644
index 000000000..6541122e1
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_28_world_2016_12_28_01_world.sql
@@ -0,0 +1,141 @@
+-- Exarch Admetius SAI
+SET @ENTRY := 17658;
+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,1,20,0,100,1,9759,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Exarch Admetius - On Quest 'Ending Their World' Finished - Say Line 0 (No Repeat)"),
+(@ENTRY,0,1,0,61,0,100,0,9759,0,0,0,80,1765800,2,0,0,0,0,1,0,0,0,0,0,0,0,"Exarch Admetius - On Quest 'Ending Their World' Finished - Run Script (No Repeat)");
+
+-- Actionlist SAI
+SET @ENTRY := 1765800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1930.46,-11812.6,62.6309,2.30995,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1937.49,-11805.7,63.7985,5.53597,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1933.49,-11814.8,62.108,2.22748,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1939.96,-11808.2,62.6752,5.49985,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1936.87,-11817,61.1348,2.24899,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1942.61,-11810.6,61.8243,5.24734,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1940.21,-11819.8,60.3075,2.36209,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,7,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1945.48,-11813.6,60.9112,5.35298,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,8,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1944.12,-11823.2,59.0743,2.18733,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,9,0,0,0,100,0,0,0,0,0,12,17659,2,300000,0,0,0,8,0,0,0,-1948.83,-11816.8,60.053,5.34669,"Exarch Admetius - On Script - Summon Creature 'Blade of Argus'"),
+(@ENTRY,9,10,0,0,0,100,0,0,0,0,0,12,17116,2,300000,0,0,0,8,0,0,0,-1958.72,-11821.6,58.8921,0.461123,"Exarch Admetius - On Script - Summon Creature 'Exarch Menelaous'"),
+(@ENTRY,9,11,0,0,0,100,0,0,0,0,0,12,17214,2,300000,0,0,0,8,0,0,0,-1960.27,-11819.9,59.571,0.295709,"Exarch Admetius - On Script - Summon Creature 'Anchorite Fateema'"),
+(@ENTRY,9,12,0,0,0,100,0,0,0,0,0,12,17101,2,300000,0,0,0,8,0,0,0,-1959.95,-11823.8,57.6277,0.372766,"Exarch Admetius - On Script - Summon Creature 'Diktynna'"),
+(@ENTRY,9,13,0,0,0,100,0,0,0,0,0,12,17215,2,300000,0,0,0,8,0,0,0,-1961.16,-11823.4,57.702,0.640498,"Exarch Admetius - On Script - Summon Creature 'Daedal'"),
+(@ENTRY,9,14,0,0,0,100,0,0,0,0,0,12,17110,2,300000,0,0,0,8,0,0,0,-1961.2,-11821.9,58.6004,0.525438,"Exarch Admetius - On Script - Summon Creature 'Acteon'"),
+(@ENTRY,9,15,0,0,0,100,0,0,0,0,0,12,17440,2,300000,0,0,0,8,0,0,0,-1964.16,-11827,56.1668,0.561564,"Exarch Admetius - On Script - Summon Creature 'High Chief Stillpine'"),
+(@ENTRY,9,16,0,0,0,100,0,0,0,0,0,12,17682,2,300000,0,0,0,8,0,0,0,-1966.07,-11824.7,57.2651,0.161011,"Exarch Admetius - On Script - Summon Creature 'Princess Stillpine'"),
+(@ENTRY,9,17,0,0,0,100,0,0,0,0,0,12,17443,2,300000,0,0,0,8,0,0,0,-1966.24,-11822,58.598,6.20858,"Exarch Admetius - On Script - Summon Creature 'Kurz the Revelator'"),
+(@ENTRY,9,18,0,0,0,100,0,0,0,0,0,12,17445,2,300000,0,0,0,8,0,0,0,-1968.9,-11829.1,55.0413,0.386419,"Exarch Admetius - On Script - Summon Creature 'Stillpine the Younger'"),
+(@ENTRY,9,19,0,0,0,100,0,0,0,0,0,12,17242,2,300000,0,0,0,8,0,0,0,-1948.33,-11832.6,57.24,1.14982,"Exarch Admetius - On Script - Summon Creature 'Archaeologist Adamant Ironheart'"),
+(@ENTRY,9,20,0,0,0,100,0,0,0,0,0,12,17240,2,300000,0,0,0,8,0,0,0,-1950.2,-11831.7,56.9671,1.09092,"Exarch Admetius - On Script - Summon Creature 'Admiral Odesyus'"),
+(@ENTRY,9,21,0,0,0,100,0,0,0,0,0,12,17117,2,300000,0,0,0,8,0,0,0,-1952.31,-11831.3,56.7056,0.91224,"Exarch Admetius - On Script - Summon Creature 'Injured Night Elf Priestess'"),
+(@ENTRY,9,22,0,0,0,100,0,0,0,0,0,12,17246,2,300000,0,0,0,8,0,0,0,-1949.92,-11834,56.7319,1.21854,"Exarch Admetius - On Script - Summon Creature Cookie McWeaksauce"),
+(@ENTRY,9,23,0,0,0,100,0,0,0,0,0,12,17241,2,300000,0,0,0,8,0,0,0,-1952.39,-11833.5,56.4305,0.977035,"Exarch Admetius - On Script - Summon Creature Priestess Kyleen Ildinare"),
+(@ENTRY,9,24,0,0,0,100,0,0,0,0,0,12,17311,2,300000,0,0,0,8,0,0,0,-1954.8,-11838.6,55.2527,1.1616,"Exarch Admetius - On Script - Summon Creature 'Cowlen'"),
+(@ENTRY,9,25,0,0,0,100,0,0,0,0,0,12,17649,2,300000,0,0,0,8,0,0,0,-1955.7,-11843.1,54.1458,1.17557,"Exarch Admetius - On Script - Summon Creature Kessel"),
+(@ENTRY,9,26,0,0,0,100,0,0,0,0,0,12,17468,2,300000,0,0,0,8,0,0,0,-1965.8,-11838.7,53.2196,0.792683,"Exarch Admetius - On Script - Summon Creature Prophet Velen");
+
+-- Blade of Argus SAI
+SET @ENTRY := 17659;
+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,54,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Blade of Argus - On Just Summoned - Set Flag Standstate Kneel");
+
+-- Diktynna SAI
+SET @ENTRY := 17101;
+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,54,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acteon - On Just Summoned - Set Event Phase 1"),
+(@ENTRY,0,1,0,1,1,100,0,3000,3000,5000,8000,5,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acteon - Out of Combat - Play Emote 4");
+
+-- Exarch Menelaous SAI
+SET @ENTRY := 17116;
+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,54,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acteon - On Just Summoned - Set Event Phase 1"),
+(@ENTRY,0,1,0,1,1,100,0,3000,3000,5000,8000,5,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acteon - Out of Combat - Play Emote 4"),
+(@ENTRY, 0, 2, 0, 64, 0, 100, 0, 0, 0, 0, 0, 33, 17116, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'On gossip hello credit for quest 9663');
+
+-- 17215SAI
+SET @ENTRY := 17215;
+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,54,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acteon - On Just Summoned - Set Event Phase 1"),
+(@ENTRY,0,1,0,1,1,100,0,3000,3000,5000,8000,5,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acteon - Out of Combat - Play Emote 4");
+
+-- Acteon SAI
+SET @ENTRY := 17110;
+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,54,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acteon - On Just Summoned - Set Event Phase 1"),
+(@ENTRY,0,1,0,1,1,100,0,3000,3000,5000,8000,5,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acteon - Out of Combat - Play Emote 4");
+
+-- Anchorite Fateema SAI
+SET @ENTRY := 17214;
+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,54,0,100,0,0,0,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anchorite Fateema - On Just Summoned - Play Emote 10");
+
+-- Admiral Odesyus SAI
+SET @ENTRY := 17240;
+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,64,0,100,0,0,0,0,0,33,17240,0,0,0,0,0,7,0,0,0,0,0,0,0,"Admiral Odesyus - On Gossip Hello - Quest Credit 'The Kessel Run'"),
+(@ENTRY,0,1,0,54,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Admiral Odesyus - On Just Summoned - Set Event Phase 1"),
+(@ENTRY,0,2,0,1,1,100,0,0,0,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Admiral Odesyus - Out of Combat - Play Emote 10 (Phase 1)");
+
+-- Cowlen SAI
+SET @ENTRY := 17311;
+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,1,62,0,100,0,7401,0,0,0,5,18,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cowlen - On Gossip Option 0 Selected - Play Emote 18"),
+(@ENTRY,0,1,0,61,0,100,0,7401,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cowlen - On Gossip Option 0 Selected - Close Gossip"),
+(@ENTRY,0,2,0,54,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cowlen - On Just Summoned - Set Event Phase 1"),
+(@ENTRY,0,3,0,1,1,100,0,0,0,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cowlen - Out of Combat - Play Emote 10 (Phase 1)");
+
+-- Archaeologist Adamant Ironheart SAI
+SET @ENTRY := 17242;
+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,54,0,100,0,0,0,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archaeologist Adamant Ironheart - On Just Summoned - Play Emote 10");
+
+-- Injured Night Elf Priestess SAI
+SET @ENTRY := 17117;
+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,1,54,0,100,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Just Summoned - Remove Flag Standstate Sleep"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Just Summoned - Play Emote 10");
+
+-- "Cookie" McWeaksauce SAI
+SET @ENTRY := 17246;
+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,54,0,100,0,0,0,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cookie McWeaksauce - On Just Summoned - Play Emote 10");
+
+-- Priestess Kyleen Il'dinare SAI
+SET @ENTRY := 17241;
+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,54,0,100,0,0,0,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Priestess Kyleen Il'dinare - On Just Summoned - Play Emote 10");
+
+-- Kessel SAI
+SET @ENTRY := 17649;
+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,54,0,100,0,0,0,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kessel - On Just Summoned - Play Emote 10");
diff --git a/sql/updates/world/master/2018_03_17_29_world_2016_12_28_03_world.sql b/sql/updates/world/master/2018_03_17_29_world_2016_12_28_03_world.sql
new file mode 100644
index 000000000..d8ed1fd2f
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_29_world_2016_12_28_03_world.sql
@@ -0,0 +1,147 @@
+-- LBRS Pathing
+SET @NPC := 43503;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH,1, -24.539305,-514.424866,29.163296, 0),
+(@PATH,2, -24.539305,-514.424866,29.163296, 30000),
+(@PATH,3, -49.821911,-513.863159,29.187195, 0),
+(@PATH,4, -49.821911,-513.863159,29.187195, 30000);
+
+UPDATE `creature` SET `position_x`=-39.0271, `position_y`=-547.342, `position_z`=16.1255, `orientation`=4.97512 WHERE `guid`=43559;
+SET @NPC := 43559;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH,1, -39.107231,-547.148987,16.125872, 60*1000),
+(@PATH,2, -39.597519,-523.890381,4.992621, 30*1000);
+
+SET @NPC := 40154;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH,1, -48.089626,-460.303558,16.398632, 0),
+(@PATH,2, -8.386492,-461.059998,16.728352, 0),
+(@PATH,3, -47.694778,-460.330566,16.402576, 0),
+(@PATH,4, -47.758339,-472.839417,16.333258, 0),
+(@PATH,5, -40.366806,-493.487183,16.186602, 0),
+(@PATH,6, -39.576500,-509.575165,5.856623, 30*1000),
+(@PATH,7, -39.994362,-493.414276,16.188383, 0),
+(@PATH,8, -47.637386,-472.980103,16.333862, 0);
+
+UPDATE `creature` SET `position_x`=-72.9836, `position_y`=-517.218, `position_z`=-7.14286, `orientation`=4.7285 WHERE `guid`=43560;
+SET @NPC := 43560;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH,1, -73.970467,-517.234009,-7.142864, 0),
+(@PATH,2, -73.874817,-523.169250,-7.142920, 0),
+(@PATH,3, -73.265968,-540.061218,-18.795183, 0),
+(@PATH,4, -73.173820,-545.779480,-18.800999, 0),
+(@PATH,5, -63.243862,-549.406189,-18.812057, 0),
+(@PATH,6, -18.329285,-549.121521,-18.785419, 0),
+(@PATH,7, -5.791784,-542.450745,-18.793913, 0),
+(@PATH,8, -5.484589,-523.005493,-7.142718, 0),
+(@PATH,9, -5.638316,-512.436646,-7.142718, 0),
+(@PATH,10, -5.917571,-493.237671,-18.795147, 0),
+(@PATH,11, -14.509295,-487.841888,-18.789783, 0),
+(@PATH,12, -66.097374,-487.162323,-18.788757, 0),
+(@PATH,13, -73.520866,-493.968750,-18.793919, 0),
+(@PATH,14, -73.070999,-511.362244,-7.242242, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=43560;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(43560, 43560, 0, 0, 2, 0, 0),
+(43560, 43561, 3, 0, 2, 0, 0);
+
+UPDATE `creature` SET `position_x`=-111.52, `position_y`=-495.227, `position_z`=-18.4569, `orientation`=1.48874 WHERE `guid`=43764;
+
+SET @NPC := 43764;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH,1, -111.519859,-495.227142,-18.456940),
+(@PATH,2, -109.896652,-464.849060,-18.934961),
+(@PATH,3, -84.653816,-439.250580,-18.934961),
+(@PATH,4, -67.780334,-419.889923,-18.934961),
+(@PATH,5, -60.713531,-417.953033,-18.934961),
+(@PATH,6, -9.332710,-420.316162,-18.934961),
+(@PATH,7, -2.238527,-422.439362,-18.934961),
+(@PATH,8, -1.244248,-446.211823,-18.934753),
+(@PATH,9, 19.821653,-447.426331,-18.934378),
+(@PATH,10, 18.931326,-493.151703,-18.483871),
+(@PATH,11, 15.599535,-504.352753,-18.405764),
+(@PATH,12, 16.812010,-512.320251,-18.463589),
+(@PATH,13, 16.011930,-504.230652,-18.412947),
+(@PATH,14, 19.295931,-492.924255,-18.492430),
+(@PATH,15, 19.841694,-448.336029,-18.933733),
+(@PATH,16, -0.717553,-446.633148,-18.934631),
+(@PATH,17, -1.842408,-422.642365,-18.934040),
+(@PATH,18, -9.304630,-420.401215,-18.934040),
+(@PATH,19, -60.141975,-418.226532,-18.934040),
+(@PATH,20, -67.558952,-420.345734,-18.934040),
+(@PATH,21, -84.157814,-439.430664,-18.934040),
+(@PATH,22, -109.428772,-465.330292,-18.934040),
+(@PATH,23, -111.255486,-495.324738,-18.456909);
+
+-- Grunt in the middle of the main corridor patrolling back and forth between two tents
+UPDATE `creature` SET `position_x`=-41.9485, `position_y`=-425.748, `position_z`=-18.935, `orientation`=0.458297 WHERE `guid`=43764;
+
+SET @NPC := 43767;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH,1, -42.213486,-425.895782,-18.934973, 30*1000),
+(@PATH,2, -53.331005,-413.390137,-18.934973, 30*1000);
+
+-- Patrol of one grunt and one darkweaver patrolling all the way
+UPDATE `creature` SET `position_x`=-109.985, `position_y`=-456.958, `position_z`=-18.9344, `orientation`=4.69159 WHERE `guid`=43763;
+UPDATE `creature` SET `position_x`=-112.677, `position_y`=-458.12, `position_z`=-18.9344, `orientation`=4.69159 WHERE `guid`=43771;
+SET @NPC := 43763;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH,1, -111.095695,-457.167389,-18.934425, 0),
+(@PATH,2, -111.467453,-475.041534,-18.539604, 0),
+(@PATH,3, -110.836365,-457.761536,-18.933743, 0),
+(@PATH,4, -90.937553,-443.860382,-18.933743, 0),
+(@PATH,5, -65.725304,-416.266144,-18.933743, 0),
+(@PATH,6, -1.099830,-418.993073,-18.759935, 0),
+(@PATH,7, 0.389136,-443.609253,-18.934147, 0),
+(@PATH,8, 23.756561,-446.480286,-18.934437, 0),
+(@PATH,9, 20.058512,-473.346893,-18.416866, 0),
+(@PATH,10, 19.636366,-497.844696,-18.437708, 0),
+(@PATH,11, 16.802956,-496.517242,-18.383026, 0),
+(@PATH,12, 15.794456,-472.194489,-18.580204, 0),
+(@PATH,13, 19.537477,-449.352936,-18.934959, 0),
+(@PATH,14, -1.293265,-448.573944,-18.935009, 0),
+(@PATH,15, -4.664356,-423.750244,-18.933882, 0),
+(@PATH,16, -24.780350,-420.808136,-18.933882, 0),
+(@PATH,17, -65.957001,-420.163727,-18.933882, 0),
+(@PATH,18, -90.123260,-445.283661,-18.933882, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=43763;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(43763, 43763, 0, 0, 2, 0, 0),
+(43763, 43771, 3, 0, 2, 0, 0);
diff --git a/sql/updates/world/master/2018_03_17_30_world_2016_12_28_04_world.sql b/sql/updates/world/master/2018_03_17_30_world_2016_12_28_04_world.sql
new file mode 100644
index 000000000..653309b0b
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_30_world_2016_12_28_04_world.sql
@@ -0,0 +1,8 @@
+DELETE FROM `creature_addon` WHERE guid IN(52480,52481);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(52480, 0, 0, 8, 1, 0, NULL),
+(52481, 0, 0, 8, 1, 0, NULL);
+
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_illidari_nightlord_shadow_inferno';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(39645,'spell_illidari_nightlord_shadow_inferno');
diff --git a/sql/updates/world/master/2018_03_17_31_world_2016_12_28_06_world.sql b/sql/updates/world/master/2018_03_17_31_world_2016_12_28_06_world.sql
new file mode 100644
index 000000000..a9aba1426
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_31_world_2016_12_28_06_world.sql
@@ -0,0 +1,34 @@
+-- The Fallen Exarch (10915)
+DELETE FROM `event_scripts` WHERE `id`=14444;
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI', `ScriptName`='' WHERE entry=184999;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=184999 AND `source_type`=1;
+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
+(184999, 1, 0, 0, 64, 0, 100, 0, 1, 0, 0, 0, 12, 22452, 4, 30000, 0, 0, 0, 8, 0, 0, 0, -3361.91, 5153.95, -9.00, 1.57, 'Auchenai Coffin - On Gossip Hello - Summon Creature');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=184999;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22, 1, 184999, 1, 0, 29, 1, 22452, 80, 0, 1, 0, 0, '', 'No NPC Nearby to run action');
+
+DELETE FROM `creature_template_addon` WHERE `entry`=22452;
+INSERT INTO `creature_template_addon` (`entry`,`bytes1`,`bytes2`,`auras`) VALUES
+(22452,0,1,"17327");
+
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768, `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=22452;
+UPDATE `creature_template` SET `InhabitType`=4, `flags_extra`=0 WHERE `entry`=21903;
+UPDATE `creature` SET `modelid`=20597 WHERE `id`=21903;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22452 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2245200 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
+(22452, 0, 0, 0, 63, 0, 100, 0, 0, 0, 0, 0, 80, 2245200, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reanimated Exarch - Just created - action list'),
+(2245200, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 3, 0, 21024, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reanimated Exarch - action list - morph'),
+(2245200, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reanimated Exarch - action list - Say Line 0'),
+(2245200, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 11, 36004, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reanimated Exarch - action list - CAST 36004'),
+(2245200, 9, 3, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 4.72, 'Reanimated Exarch - action list - Set Orientation'),
+(2245200, 9, 4, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 19, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reanimated Exarch - action list - Remove Unit Flags'),
+(2245200, 9, 5, 0, 0, 0, 100, 0, 500, 500, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 40, 0, 0, 0, 0, 0, 0, 'Reanimated Exarch - action list - Attack Start'),
+(22452, 0, 1, 0, 0, 0, 100, 1, 2000, 2000, 0, 0, 11, 8258, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reanimated Exarch - In Combat - Cast Devotion Aura');
+
+DELETE FROM `creature_text` WHERE `CreatureID`=22452;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(22452, 0, 0, 'You have brought me back too soon! I am weak yet... What is this! Who... It matters not! DIE!', 12, 0, 100, 1, 0, 0, 20298, 'Reanimated Exarch');
diff --git a/sql/updates/world/master/2018_03_17_32_world_2016_12_28_07_world.sql b/sql/updates/world/master/2018_03_17_32_world_2016_12_28_07_world.sql
new file mode 100644
index 000000000..a68461dc8
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_32_world_2016_12_28_07_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `action_type`=11, `action_param1`=30444, `action_param2`=0, `action_param3`=0, `target_type`=7, `target_x`=0, `target_y`=0, `target_z`=0, `target_o`=0, `comment`='Totem of Yor - On Quest \'Totem of Vark\' Taken - Cast \'Stillpine Ancestor Yor TRIGGER\'' WHERE  `entryorguid`=17363 AND `source_type`=0 AND `id`=0 AND `link`=0;
diff --git a/sql/updates/world/master/2018_03_17_33_world_2016_12_28_08_world.sql b/sql/updates/world/master/2018_03_17_33_world_2016_12_28_08_world.sql
new file mode 100644
index 000000000..32d7b58de
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_33_world_2016_12_28_08_world.sql
@@ -0,0 +1,20 @@
+-- [Q] World of Shadows -- http://wotlk.openwow.com/quest=11004
+-- Severin SAI
+SET @ENTRY := 23042;
+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,19,0,100,0,11004,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Severin - On Quest 'World of Shadows' Taken - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2304200;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,0,7000,0,0,0,0,19,23038,10,0,0,0,0,0,"Severin - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,6000,6000,0,0,5,16,0,0,0,0,0,1,0,0,0,0,0,0,0,"Severin - On Script - Play Emote 16"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Severin - On Script - Say Line 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (23038, 23042);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(23038, 0, 0, 'The arakkoa are hidden... everywhere!', 12, 0, 100, 0, 0, 0, 21917, 'Sky Commander Adaris'),
+(23042, 0, 0, 'Rest now, Adaris. You need to recover your strength.', 12, 0, 100, 0, 0, 0, 21918, 'Severin');
diff --git a/sql/updates/world/master/2018_03_17_34_world_2016_12_28_10_world.sql b/sql/updates/world/master/2018_03_17_34_world_2016_12_28_10_world.sql
new file mode 100644
index 000000000..37d39227d
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_34_world_2016_12_28_10_world.sql
@@ -0,0 +1,20 @@
+-- 
+-- [Q] The Fel and the Furious -- http://wotlk.openwow.com/?quest=10612
+-- Plexi SAI
+SET @ENTRY := 21790;
+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,19,0,100,0,10612,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Plexi - On Quest 'The Fel and the Furious' Taken - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2179000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.797690,"Plexi - On Script - Set Oriebtation 1.797"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0,"Plexi - On Script - Play Emote 25"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,1,0,7000,0,0,0,0,1,0,0,0,0,0,0,0,"Plexi - On Script - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=21790;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(21790, 0, 0, 'I''ve rigged a few control consoles down the slope. Get one quickly and take control of the fel reaver! You''ll only have a limited amount of time.', 12, 0, 100, 0, 0, 0, 19666, 'Plexi');
diff --git a/sql/updates/world/master/2018_03_17_35_world_2016_12_28_12_world.sql b/sql/updates/world/master/2018_03_17_35_world_2016_12_28_12_world.sql
new file mode 100644
index 000000000..2e32a7dd1
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_35_world_2016_12_28_12_world.sql
@@ -0,0 +1,45 @@
+-- [Q] Galaen's Fate -- http://wotlk.openwow.com/quest=9579
+-- Galaen's Corpse SAI
+SET @ENTRY := 17508;
+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,1,19,0,100,0,9579,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Galaen's Corpse - On Quest 'Galaen's Fate' Taken - Run Script"),
+(@ENTRY,0,1,0,61,0,100,0,9579,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Galaen's Corpse - On Quest 'Galaen's Fate' Taken - Store Targetlist"),
+(@ENTRY,0,2,0,17,0,100,0,17426,0,0,0,64,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Galaen's Corpse - On Summoned Unit - Store Targetlist");
+
+-- Conditions for summon
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=17508;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,17508,0,0,29,0,17426,20,0,1,0,0,"","Galaen's Corpse - Do not summon Galaen if creature is in 20 yards range");
+
+-- Actionlist SAI
+SET @ENTRY := 1750800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,12,17426,1,15000,0,0,0,8,0,0,0,-2090.03,-11297.5,63.5025,3.56455,"Galaen's Corpse - On Script - Summon Creature 'Galaen'"),
+(@ENTRY,9,1,0,0,0,100,0,100,100,0,0,100,1,0,0,0,0,0,12,2,0,0,0,0,0,0,"Galaen's Corpse - On Script - Send Target 1");
+
+-- Actionlist SAI
+SET @ENTRY := 1750800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,12,17426,1,15000,0,0,0,8,0,0,0,-2090.03,-11297.5,63.5025,3.56455,"Galaen's Corpse - On Script - Summon Creature 'Galaen'"),
+(@ENTRY,9,1,0,0,0,100,0,100,100,0,0,100,1,0,0,0,0,0,12,2,0,0,0,0,0,0,"Galaen's Corpse - On Script - Send Target 1"),
+(@ENTRY,9,2,0,0,0,100,0,100,100,0,0,45,1,1,0,0,0,0,12,2,0,0,0,0,0,0,"Galaen's Corpse - On Script - Set Data 1 1"),
+(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,1,0,3000,0,0,0,0,12,2,0,0,0,0,0,0,"Galaen's Corpse - On Script - Say Line 0"),
+(@ENTRY,9,4,0,0,0,100,0,3000,3000,0,0,1,1,4000,0,0,0,0,12,2,0,0,0,0,0,0,"Galaen's Corpse - On Script - Say Line 1"),
+(@ENTRY,9,5,0,0,0,100,0,4000,4000,0,0,1,2,4000,0,0,0,0,12,2,0,0,0,0,0,0,"Galaen's Corpse - On Script - Say Line 2");
+
+-- Galaen SAI
+SET @ENTRY := 17426;
+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,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"Galaen - On Data Set 1 1 - Set Orientation Stored Payer");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=17426;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(17426, 0, 0, 'Morae... Is that you?', 12, 0, 100, 6, 0, 0, 14262, 'Galaen'),
+(17426, 1, 0, 'No... you''re not Morae, but I sense that you have met. When you see her, tell her that I survived the crash, only to be done in by the infiltrators.', 12, 0, 100, 274, 0, 0, 14263, 'Galaen'),
+(17426, 2, 0, 'Let her know... my last thought was of her...', 12, 0, 100, 1, 0, 0, 14264, 'Galaen');
diff --git a/sql/updates/world/master/2018_03_17_36_world_2016_12_29_01_world.sql b/sql/updates/world/master/2018_03_17_36_world_2016_12_29_01_world.sql
new file mode 100644
index 000000000..eb8a72c27
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_36_world_2016_12_29_01_world.sql
@@ -0,0 +1,27 @@
+-- 
+-- [Q] The Fel and the Furious -- http://wotlk.openwow.com/?quest=10613
+-- Nakansi SAI
+SET @ENTRY := 21789;
+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,19,0,100,0,10613,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Nakansi - On Quest 'The Fel and the Furious' Taken - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2178900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.989615,"Nakansi - On Script - Set Oriebtation 5.989615"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nakansi - On Script - Play Emote 25"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,1,0,7000,0,0,0,0,1,0,0,0,0,0,0,0,"Nakansi - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,5000,5000,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nakansi - On Script - ReSet Oriebtation");
+
+
+DELETE FROM `creature_text` WHERE `CreatureID`=21789;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(21789, 0, 0, 'I''ve rigged a few control consoles down the slope. Get one quickly and take control of the fel reaver! You''ll only have a limited amount of time.', 12, 0, 100, 0, 0, 0, 19666, 'Nakansi');
+
+SET @ENTRY := 2179000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9 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
+(@ENTRY,9,3,0,0,0,100,0,5000,5000,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Plexi - On Script - ReSet Oriebtation");
diff --git a/sql/updates/world/master/2018_03_17_37_world_2016_12_29_06_world.sql b/sql/updates/world/master/2018_03_17_37_world_2016_12_29_06_world.sql
new file mode 100644
index 000000000..2a4bf3e31
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_37_world_2016_12_29_06_world.sql
@@ -0,0 +1,142 @@
+-- Ethereal Sorcerer SAI
+SET @ENTRY := 18313;
+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,2,0,0,2400,3800,11,15791,64,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat CMC - Cast 'Arcane Missiles' (Normal Dungeon)"),
+(@ENTRY,0,1,0,0,0,100,6,5100,10800,10800,15700,11,25603,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat - Cast 'Slow' (Dungeon)"),
+(@ENTRY,0,2,0,0,0,100,6,14000,22700,22300,22300,11,32349,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat - Cast 'Summon Arcane Fiend' (Dungeon)"),
+(@ENTRY,0,3,0,0,0,100,6,14000,22700,22300,22300,11,32353,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat - Cast 'Summon Arcane Fiend' (Dungeon)"),
+(@ENTRY,0,4,0,0,0,100,4,0,0,2400,3800,11,22273,64,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat CMC - Cast 'Arcane Missiles' (Heroic Dungeon)");
+
+-- Cobalt Serpent SAI
+SET @ENTRY := 19428;
+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,2,0,0,3400,4800,11,17503,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat CMC - Cast 'Frostbolt' (Normal Dungeon)"),
+(@ENTRY,0,1,0,0,0,100,2,4000,5000,8000,11000,11,38193,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat - Cast 'Lightning Breath' (Normal Dungeon)"),
+(@ENTRY,0,2,0,0,0,100,4,4000,5000,8000,11000,11,38133,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat - Cast 'Lightning Breath' (Heroic Dungeon)"),
+(@ENTRY,0,3,0,0,0,100,6,6000,7000,7000,13000,11,38110,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat - Cast 'Wing Buffet' (Dungeon)"),
+(@ENTRY,0,4,0,0,0,100,4,0,0,3400,4800,11,38238,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat CMC - Cast 'Frostbolt' (Heroic Dungeon)");
+
+-- Master Daellis Dawnstrike SAI
+SET @ENTRY := 19705;
+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,2300,3900,2300,3900,11,50092,64,0,0,0,0,2,0,0,0,0,0,0,0,"Master Daellis Dawnstrike - In Combat CMC - Cast 'Shoot'"),
+(@ENTRY,0,1,0,0,0,100,0,12000,15000,11000,14000,11,35963,1,0,0,0,0,2,0,0,0,0,0,0,0,"Master Daellis Dawnstrike - In Combat - Cast 'Improved Wing Clip'"),
+(@ENTRY,0,2,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Master Daellis Dawnstrike - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Deathforge Summoner SAI
+SET @ENTRY := 20872;
+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,0,0,2400,3800,11,9613,64,0,0,0,0,2,0,0,0,0,0,0,0,"Deathforge Summoner - In Combat CMC - Cast 'Shadow Bolt'"),
+(@ENTRY,0,1,0,0,0,100,0,7000,9000,17000,24000,11,37628,1,0,0,0,0,2,0,0,0,0,0,0,0,"Deathforge Summoner - In Combat - Cast 'Fel Immolate'");
+
+-- Gordunni Soulreaper SAI
+SET @ENTRY := 23022;
+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,0,0,2400,3800,11,15232,64,0,0,0,0,2,0,0,0,0,0,0,0,"Gordunni Soulreaper - In Combat CMC - Cast 'Shadow Bolt'"),
+(@ENTRY,0,1,0,0,0,100,0,4000,6000,18000,25000,11,20464,1,0,0,0,0,1,0,0,0,0,0,0,0,"Gordunni Soulreaper - In Combat - Cast 'Summon Skeleton'"),
+(@ENTRY,0,2,0,2,0,100,1,0,30,0,0,11,20743,1,0,0,0,0,2,0,0,0,0,0,0,0,"Gordunni Soulreaper - Between 0-30% Health - Cast 'Drain Life' (No Repeat)");
+
+-- Dragonflayer Strategist SAI
+SET @ENTRY := 23956;
+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,2,0,0,2300,5000,11,42772,64,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Strategist - In Combat CMC - Cast 'Hurl Dagger' (Normal Dungeon)"),
+(@ENTRY,0,1,0,0,0,100,2,4500,5000,11000,16000,11,54962,1,0,0,0,0,5,0,0,0,0,0,0,0,"Dragonflayer Strategist - In Combat - Cast 'Ticking Bomb' (Normal Dungeon)"),
+(@ENTRY,0,2,0,0,0,100,4,4500,5000,11000,16000,11,60227,1,0,0,0,0,5,0,0,0,0,0,0,0,"Dragonflayer Strategist - In Combat - Cast 'Ticking Time Bomb' (Heroic Dungeon)"),
+(@ENTRY,0,3,0,0,0,100,6,7500,9000,13000,15000,11,42972,1,0,0,0,0,5,0,0,0,0,0,0,0,"Dragonflayer Strategist - In Combat - Cast 'Blind' (Dungeon)"),
+(@ENTRY,0,4,0,0,0,100,4,0,0,2300,5000,11,59685,64,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Strategist - In Combat CMC - Cast 'Hurl Dagger' (Heroic Dungeon)");
+
+-- Solstice Hunter SAI
+SET @ENTRY := 26389;
+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,0,0,2300,3900,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Solstice Hunter - In Combat CMC - Cast 'Shoot'"),
+(@ENTRY,0,1,0,9,0,100,0,5,30,9000,13000,11,14443,1,0,0,0,0,2,0,0,0,0,0,0,0,"Solstice Hunter - Within 5-30 Range - Cast 'Multi-Shot'"),
+(@ENTRY,0,2,0,0,0,100,0,7000,9000,19000,24000,11,52604,1,0,0,0,0,5,0,0,0,0,0,0,0,"Solstice Hunter - In Combat - Cast 'Scorpid Sting'"),
+(@ENTRY,0,3,0,0,0,100,0,11000,15000,18000,24000,11,52606,1,0,0,0,0,1,0,0,0,0,0,0,0,"Solstice Hunter - In Combat - Cast 'Immolation Trap'"),
+(@ENTRY,0,4,0,2,0,100,1,0,50,0,0,11,49561,0,0,0,0,0,1,0,0,0,0,0,0,0,"Solstice Hunter - Between 0-50% Health - Cast 'Worgen Transform' (No Repeat)"),
+(@ENTRY,0,5,0,0,0,100,0,12000,15000,18000,21000,11,31975,1,0,0,0,0,5,0,0,0,0,0,0,0,"Solstice Hunter - In Combat - Cast 'Serpent Sting'");
+
+-- Stars' Rest Sentinel SAI
+SET @ENTRY := 26448;
+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,0,2300,2300,3900,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Stars' Rest Sentinel - In Combat CMC - Cast 'Shoot'"),
+(@ENTRY,0,1,0,9,0,100,0,8,100,9000,13000,11,47059,1,0,0,0,0,2,0,0,0,0,0,0,0,"Stars' Rest Sentinel - Within 8-100 Range - Cast 'Frost Arrow'");
+
+-- Wastes Taskmaster SAI
+SET @ENTRY := 26493;
+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,0,0,3400,4800,11,16583,64,0,0,0,0,2,0,0,0,0,0,0,0,"Wastes Taskmaster - In Combat CMC - Cast 'Shadow Shock'"),
+(@ENTRY,0,1,0,9,0,100,0,0,8,12000,15000,11,32712,1,0,0,0,0,1,0,0,0,0,0,0,0,"Wastes Taskmaster - Within 0-8 Range - Cast 'Shadow Nova'");
+
+-- Silverbrook Trapper SAI
+SET @ENTRY := 26679;
+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,0,0,2300,3900,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Silverbrook Trapper - In Combat CMC - Cast 'Shoot'"),
+(@ENTRY,0,1,0,9,0,100,0,0,20,9000,15000,11,13608,1,0,0,0,0,2,0,0,0,0,0,0,0,"Silverbrook Trapper - Within 0-20 Range - Cast 'Hooked Net'");
+
+-- Moa'ki Warrior SAI
+SET @ENTRY := 27178;
+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,0,0,2300,3900,11,38556,64,0,0,0,0,2,0,0,0,0,0,0,0,"Moa'ki Warrior - In Combat CMC - Cast 'Throw'");
+
+-- Onslaught Raven Priest SAI
+SET @ENTRY := 27202;
+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,1,0,0,3400,4800,11,50740,64,0,0,0,0,2,0,0,0,0,0,0,0,"Onslaught Raven Priest - In Combat CMC - Cast 'Raven Flock' (No Repeat)"),
+(@ENTRY,0,1,0,2,0,100,0,0,30,14000,18000,11,50750,1,0,0,0,0,1,0,0,0,0,0,0,0,"Onslaught Raven Priest - Between 0-30% Health - Cast 'Raven Heal'"),
+(@ENTRY,0,2,3,8,0,100,1,48679,0,0,0,85,48655,2,0,0,0,0,1,0,0,0,0,0,0,0,"Onslaught Raven Priest - On Spellhit 'Banshee's Magic Mirror' - Invoker Cast 'The Perfect Dissemblance: Summon Player's Footman & Credit Credit' (No Repeat)"),
+(@ENTRY,0,3,7,61,0,100,0,48679,0,0,0,1,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Onslaught Raven Priest - On Spellhit 'Banshee's Magic Mirror' - Say Line 2 (No Repeat)"),
+(@ENTRY,0,4,0,8,0,100,255,48268,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Onslaught Raven Priest - On Spellhit 'Container of Rats' - Despawn Instant (No Repeat) (Dungeon & Raid) (Debug)"),
+(@ENTRY,0,5,0,4,0,30,1,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Onslaught Raven Priest - On Aggro - Say Line 0 (No Repeat)"),
+(@ENTRY,0,6,0,1,0,50,0,0,45000,60000,90000,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Onslaught Raven Priest - Out of Combat - Say Line 1"),
+(@ENTRY,0,7,8,61,0,100,0,48679,0,0,0,11,48654,0,0,0,0,0,1,0,0,0,0,0,0,0,"Onslaught Raven Priest - On Spellhit 'Banshee's Magic Mirror' - Cast 'The Perfect Dissemblance: Summon Priest's Footman' (No Repeat)"),
+(@ENTRY,0,8,9,61,0,100,0,48679,0,0,0,85,48763,0,0,0,0,0,7,0,0,0,0,0,0,0,"Onslaught Raven Priest - On Spellhit 'Banshee's Magic Mirror' - Invoker Cast 'Scarlet Raven Priest Image' (No Repeat)"),
+(@ENTRY,0,9,10,61,0,100,0,48679,0,0,0,85,48761,0,0,0,0,0,7,0,0,0,0,0,0,0,"Onslaught Raven Priest - On Spellhit 'Banshee's Magic Mirror' - Invoker Cast 'Scarlet Raven Priest Image' (No Repeat)"),
+(@ENTRY,0,10,0,61,0,100,255,48679,0,0,0,2,14,0,0,0,0,0,1,0,0,0,0,0,0,0,"Onslaught Raven Priest - On Spellhit 'Banshee's Magic Mirror' - Set Faction 14 (No Repeat)");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` IN (27202);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,9,27202,0,0,20,1,0,0,0,0,0,0,'','Onslaught Raven Priest SAI event 17 require a male character'),
+(22,10,27202,0,0,20,1,1,0,0,0,0,0,'','Onslaught Raven Priest SAI event 17 require a female character');
+
+-- Steamwheedle Bruiser SAI
+SET @ENTRY := 16096;
+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,2200,3800,2200,3800,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Steamwheedle Bruiser - In Combat CMC - Cast 'Shoot'"),
+(@ENTRY,0,1,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Steamwheedle Bruiser - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(@ENTRY,0,2,0,0,0,100,0,500,1800,11000,18000,11,12024,0,0,0,0,0,2,0,0,0,0,0,0,0,"Steamwheedle Bruiser - In Combat - Cast 'Net'");
+
+-- Mag'har Hunter SAI
+SET @ENTRY := 16912;
+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,2200,3800,2200,3800,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Mag'har Hunter - In Combat CMC - Cast 'Shoot'"),
+(@ENTRY,0,1,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mag'har Hunter - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(@ENTRY,0,2,0,0,0,100,0,500,1800,11000,18000,11,12024,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mag'har Hunter - In Combat - Cast 'Net'"),
+(@ENTRY,0,3,0,1,0,100,1,1000,1000,0,0,11,32730,1,0,0,0,0,1,0,0,0,0,0,0,0,"Mag'har Hunter - Out of Combat - Cast 'Summon Tamed Ravager' (No Repeat)");
diff --git a/sql/updates/world/master/2018_03_17_38_world_2016_12_29_08_world.sql b/sql/updates/world/master/2018_03_17_38_world_2016_12_29_08_world.sql
new file mode 100644
index 000000000..cf9bbedad
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_38_world_2016_12_29_08_world.sql
@@ -0,0 +1,4 @@
+-- 
+DELETE FROM `creature_template_addon` WHERE `entry`=16408;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(16408,0,0,0,0,0, '18950');
diff --git a/sql/updates/world/master/2018_03_17_39_world_2016_12_30_03_world.sql b/sql/updates/world/master/2018_03_17_39_world_2016_12_30_03_world.sql
new file mode 100644
index 000000000..329dcbc24
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_39_world_2016_12_30_03_world.sql
@@ -0,0 +1,3 @@
+-- 
+UPDATE `smart_scripts` SET `event_flags`=2 WHERE `entryorguid`=18313 AND `source_type`=0 AND `id`=2;
+UPDATE `smart_scripts` SET `event_flags`=4 WHERE `entryorguid`=18313 AND `source_type`=0 AND `id`=3;
diff --git a/sql/updates/world/master/2018_03_17_40_world_2016_12_30_05_world.sql b/sql/updates/world/master/2018_03_17_40_world_2016_12_30_05_world.sql
new file mode 100644
index 000000000..13ec86a2e
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_40_world_2016_12_30_05_world.sql
@@ -0,0 +1,53 @@
+-- 1st Kvaldir Vessel (The Serpent's Maw) SAI
+SET @ENTRY := 25510;
+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,1,8,0,100,0,45692,0,0,0,33,25510,0,0,0,0,0,7,0,0,0,0,0,0,0,"1st Kvaldir Vessel (The Serpent's Maw) - On Spellhit 'Use Tuskarr Torch' - Quest Credit 'Burn in Effigy'"),
+(@ENTRY,0,1,2,61,0,100,0,45692,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"1st Kvaldir Vessel (The Serpent's Maw) - On Spellhit 'Use Tuskarr Torch' - Say Line 0"),
+(@ENTRY,0,2,3,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3043.885,6745.263,10.34062,6.143561,"1st Kvaldir Vessel (The Serpent's Maw) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,3,4,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3049.331,6757.823,5.417898,5.358162,"1st Kvaldir Vessel (The Serpent's Maw) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,4,5,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3054.117,6764.733,3.606305,1.500983,"1st Kvaldir Vessel (The Serpent's Maw) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,5,6,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3053.359,6773.643,3.813772,2.426008,"1st Kvaldir Vessel (The Serpent's Maw) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,6,0,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3064.19,6785.298,8.44076,4.049168,  "1st Kvaldir Vessel (The Serpent's Maw) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'");
+
+
+
+-- 2nd Kvaldir Vessel (The Kur Drakkar) SAI
+SET @ENTRY := 25511;
+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,1,8,0,100,0,45692,0,0,0,33,25511,0,0,0,0,0,7,0,0,0,0,0,0,0,"2nd Kvaldir Vessel (The Kur Drakkar) - On Spellhit 'Use Tuskarr Torch' - Quest Credit 'Burn in Effigy'"),
+(@ENTRY,0,1,2,61,0,100,0,45692,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"2nd Kvaldir Vessel (The Kur Drakkar) - On Spellhit 'Use Tuskarr Torch' - Say Line 0"),
+(@ENTRY,0,2,3,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3025.193,6784.228,8.375009,6.03884, "2nd Kvaldir Vessel (The Kur Drakkar) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,3,4,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3035.19,6794.023,4.210261,3.839725, "2nd Kvaldir Vessel (The Kur Drakkar) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,4,5,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3044.207,6799.383,3.345489,4.782203,"2nd Kvaldir Vessel (The Kur Drakkar) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,5,6,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3056.192,6807.476,7.09576,0.8726639,"2nd Kvaldir Vessel (The Kur Drakkar) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,6,0,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,3043.326,6791.393,3.042087,4.485497,"2nd Kvaldir Vessel (The Kur Drakkar) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'");
+
+-- 3rd Kvaldir Vessel (Bor's Hammer) SAI
+SET @ENTRY := 25512;
+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,1,8,0,100,0,45692,0,0,0,33,25512,0,0,0,0,0,7,0,0,0,0,0,0,0,"3rd Kvaldir Vessel (Bor's Hammer) - On Spellhit 'Use Tuskarr Torch' - Quest Credit 'Burn in Effigy'"),
+(@ENTRY,0,1,2,61,0,100,0,45692,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"3rd Kvaldir Vessel (Bor's Hammer) - On Spellhit 'Use Tuskarr Torch' - Say Line 0"),
+(@ENTRY,0,2,3,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,2877.174,6855.259,15.0139,4.363324,  "3rd Kvaldir Vessel (Bor's Hammer) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,3,4,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,2867.662,6862.611,3.956,3.263772,    "3rd Kvaldir Vessel (Bor's Hammer) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,4,5,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,2862.167,6871.526,2.134927,0.9773831,"3rd Kvaldir Vessel (Bor's Hammer) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,5,6,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,2866.583,6875.242,2.717505,4.694937, "3rd Kvaldir Vessel (Bor's Hammer) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,6,0,61,0,100,0,45692,0,0,0,50,187704,60,0,0,0,0,8,0,0,0,2852.196,6875.289,1.91545,4.084071,  "3rd Kvaldir Vessel (Bor's Hammer) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'");
+
+-- 4th Kvaldir Vessel (Bor's Anvil) SAI
+SET @ENTRY := 25513;
+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,1,8,0,100,0,45692,0,0,0,33,25513,0,0,0,0,0,7,0,0,0,0,0,0,0,"4th Kvaldir Vessel (Bor's Anvil) - On Spellhit 'Use Tuskarr Torch' - Quest Credit 'Burn in Effigy'"),
+(@ENTRY,0,1,2,61,0,100,0,45692,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"4th Kvaldir Vessel (Bor's Anvil) - On Spellhit 'Use Tuskarr Torch' - Say Line 0"),
+(@ENTRY,0,2,3,61,0,100,0,45692,0,0,0,50,187703,60,0,0,0,0,8,0,0,0,2515.687,6852.452,3.775909,5.166176,"4th Kvaldir Vessel (Bor's Anvil) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,3,4,61,0,100,0,45692,0,0,0,50,187703,60,0,0,0,0,8,0,0,0,2524.152,6848.546,5.444669,1.937312,"4th Kvaldir Vessel (Bor's Anvil) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,4,5,61,0,100,0,45692,0,0,0,50,187703,60,0,0,0,0,8,0,0,0,2524.671,6853.061,4.362841,3.42085, "4th Kvaldir Vessel (Bor's Anvil) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,5,6,61,0,100,0,45692,0,0,0,50,187703,60,0,0,0,0,8,0,0,0,2522.521,6851.036,4.778915,3.769912,"4th Kvaldir Vessel (Bor's Anvil) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'"),
+(@ENTRY,0,6,0,61,0,100,0,45692,0,0,0,50,187703,60,0,0,0,0,8,0,0,0,2520.258,6846.322,5.93863,1.570796, "4th Kvaldir Vessel (Bor's Anvil) - On Spellhit 'Use Tuskarr Torch' - Summon Gameobject 'Kvaldir Inferno'");
diff --git a/sql/updates/world/master/2018_03_17_41_world_2016_12_30_06_world.sql b/sql/updates/world/master/2018_03_17_41_world_2016_12_30_06_world.sql
new file mode 100644
index 000000000..d6b853372
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_41_world_2016_12_30_06_world.sql
@@ -0,0 +1,9 @@
+-- Warsong Battleguard
+-- 2 more found
+UPDATE `creature` SET `PhaseId` = 170 WHERE `guid` IN (110370,110378);
+-- some must have individual addons
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE  `guid` IN (110370,110378);
+DELETE FROM `creature_addon` WHERE `guid` IN (110370,110378);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(110370, 0, 0, 7, 0, 0, "29266"),
+(110378, 0, 0, 7, 0, 0, "29266");
diff --git a/sql/updates/world/master/2018_03_17_42_world_2016_12_30_07_world.sql b/sql/updates/world/master/2018_03_17_42_world_2016_12_30_07_world.sql
new file mode 100644
index 000000000..9f278578e
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_42_world_2016_12_30_07_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid`=30951 AND `source_type`=0 AND `id`=0;
diff --git a/sql/updates/world/master/2018_03_17_43_world_2016_12_30_15_world.sql b/sql/updates/world/master/2018_03_17_43_world_2016_12_30_15_world.sql
new file mode 100644
index 000000000..95e824806
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_43_world_2016_12_30_15_world.sql
@@ -0,0 +1,51 @@
+-- 
+-- Technician Dyvuun SAI -- http://www.wowhead.com/npc=16551
+SET @ENTRY := 16551;
+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,25,0,100,0,0,0,0,0,53,0,16551,1,0,0,0,1,0,0,0,0,0,0,0,"Technician Dyvuun - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Dyvuun - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,1,16551,0,0,54,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Dyvuun - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,3,0,40,0,100,0,2,16551,0,0,54,46000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Dyvuun - On Waypoint 2 Reached - Pause Waypoint"),
+(@ENTRY,0,4,0,40,0,100,0,3,16551,0,0,54,90000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Dyvuun - On Waypoint 3 Reached - Pause Waypoint"),
+(@ENTRY,0,5,6,40,0,100,0,4,16551,0,0,54,65000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Dyvuun - On Waypoint 4 Reached - Pause Waypoint"),
+(@ENTRY,0,6,0,61,0,100,0,4,16551,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Dyvuun - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,7,0,40,0,100,0,5,16551,0,0,54,100000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Dyvuun - On Waypoint 5 Reached - Pause Waypoint");
+
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(@ENTRY, 1, -4158.32, -12483.1, 45.4554, 'Technician Dyvuun'),
+(@ENTRY, 2, -4157.08, -12480.4, 45.2039, 'Technician Dyvuun'),
+(@ENTRY, 3, -4158.32, -12483.1, 45.4554, 'Technician Dyvuun'),
+(@ENTRY, 4, -4157.08, -12480.4, 45.2039, 'Technician Dyvuun'),
+(@ENTRY, 5, -4158.32, -12483.1, 45.4554, 'Technician Dyvuun');
+
+-- Actionlist SAI
+SET @ENTRY := 1655100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,3000,3000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"),
+(@ENTRY,9,1,0,0,0,100,0,7000,7000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,20,181805,100,0,0,0,0,0,"On Script - Activate Gameobject"),
+(@ENTRY,9,3,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Play Emote 4"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,12,17268,3,27000,0,0,0,8,0,0,0,-4156.35,-12477.5,46.1839,3.12414,"On Script - Summon Creature 'Image of Technician Zhanaa'"),
+(@ENTRY,9,5,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,19,17268,100,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,6,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,7,0,0,0,100,0,9000,9000,0,0,1,1,0,0,0,0,0,19,17268,100,0,0,0,0,0,"On Script - Say Line 1"),
+(@ENTRY,9,8,0,0,0,100,0,9000,9000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 1"),
+(@ENTRY,9,9,0,0,0,100,0,6000,6000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"),
+(@ENTRY,9,10,0,0,0,100,0,15000,15000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0");
+
+-- must be summned by script
+DELETE FROM `creature` WHERE guid = 62014;
+
+DELETE FROM `creature_text` WHERE `CreatureID`=16551;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(16551, 0, 0, 'Yes, Zhanna, it''s me! Your signal is weak.', 12, 0, 100, 0, 0, 0, 13687, 'Technician Dyvuun'),
+(16551, 1, 0, 'Zhanna! Gah, I have to get this thing fixed!', 12, 0, 100, 0, 0, 0, 13692, 'Technician Dyvuun');
+
+DELETE FROM `creature_text` WHERE `CreatureID`=17268;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(17268, 0, 0, 'Dyvuun, is that you?', 12, 0, 100, 0, 0, 0, 13686, 'Image of Technician Zhanaa'),
+(17268, 1, 0, 'I can barely hear you... <static> aking up!', 12, 0, 100, 0, 0, 0, 13688, 'Image of Technician Zhanaa');
diff --git a/sql/updates/world/master/2018_03_17_44_world_2016_12_30_16_world.sql b/sql/updates/world/master/2018_03_17_44_world_2016_12_30_16_world.sql
new file mode 100644
index 000000000..381ded0d6
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_44_world_2016_12_30_16_world.sql
@@ -0,0 +1,88 @@
+-- Silvermoon City Trainer - updates #2
+-- Winthren <Shield Merchant>
+UPDATE `creature` SET position_x = 9451.738, position_y = -7122.863, position_z = 16.14618, orientation = 6.128479, Spawndist = 0, MovementType = 2 WHERE guid = 57682;
+DELETE FROM `waypoints` WHERE `entry`=16693;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES 
+(16693, 1, 9451.74, -7122.86, 16.1462),
+(16693, 2, 9452.37, -7125.35, 16.1465),
+(16693, 3, 9451.99, -7128.64, 16.1465),
+(16693, 4, 9451.74, -7122.86, 16.1462),
+(16693, 5, 9451.74, -7122.86, 16.1462);
+
+-- Winthren SAI
+SET @ENTRY := 16693;
+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,25,0,100,0,0,0,0,0,53,0,16693,1,0,0,0,1,0,0,0,0,0,0,0,"Winthren - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,2,16693,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winthren - On Waypoint 2 Reached - Run Script"),
+(@ENTRY,0,2,0,40,0,100,0,3,16693,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winthren - On Waypoint 3 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,1,16693,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winthren - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,4,0,40,0,100,0,5,16693,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winthren - On Waypoint 5 Reached - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1669300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"),
+(@ENTRY,9,2,0,0,0,100,0,26000,26000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0");
+
+-- Tynna <Plate Armor Merchant>
+UPDATE `creature` SET position_x = 9453.12, position_y = -7138.64, position_z = 16.1464, orientation = 0.186189, Spawndist = 0, MovementType = 0 WHERE guid = 57621;
+DELETE FROM `waypoints` WHERE `entry`=16626;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES 
+(16626, 1, 9453.12, -7138.64, 16.1464),
+(16626, 2, 9455.66, -7135.42, 16.1352),
+(16626, 3, 9453.97, -7134.69, 16.1431),
+(16626, 4, 9451.15, -7138.66, 16.1464),
+(16626, 5, 9453.12, -7138.64, 16.1464);
+
+-- Tynna SAI
+SET @ENTRY := 16626;
+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,25,0,100,0,0,0,0,0,53,0,16626,1,0,0,0,1,0,0,0,0,0,0,0,"Tynna - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,1,16626,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tynna - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,3,16626,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tynna - On Waypoint 3 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,4,16626,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tynna - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,5,16626,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tynna - On Waypoint 5 Reached - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1662600;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"),
+(@ENTRY,9,2,0,0,0,100,0,26000,26000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0");
+
+-- Zalle
+DELETE FROM `waypoints` WHERE `entry`=16611;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES 
+(16611, 1, 9572.41, -7060.69, 18.6436),
+(16611, 2, 9581.56, -7062.5, 18.6436),
+(16611, 3, 9590.1, -7060.46, 18.6436),
+(16611, 4, 9587.3, -7060.51, 18.6436),
+(16611, 5, 9586.82, -7062.25, 18.6436),
+(16611, 6, 9581.68, -7062.86, 18.6436),
+(16611, 7, 9571.29, -7061.17, 18.6436),
+(16611, 8, 9572.41, -7060.69, 18.6436);
+
+-- Zalle SAI
+SET @ENTRY := 16611;
+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,25,0,100,0,0,0,0,0,53,0,16611,1,0,0,0,1,0,0,0,0,0,0,0,"Zalle - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,1,16611,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zalle - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,3,16611,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zalle - On Waypoint 3 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,8,16611,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zalle - On Waypoint 8 Reached - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1661100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"),
+(@ENTRY,9,2,0,0,0,100,0,26000,26000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0");
diff --git a/sql/updates/world/master/2018_03_17_45_world_2017_01_01_02_world.sql b/sql/updates/world/master/2018_03_17_45_world_2017_01_01_02_world.sql
new file mode 100644
index 000000000..537a87723
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_45_world_2017_01_01_02_world.sql
@@ -0,0 +1,39 @@
+-- Razia SAI -- http://www.wowhead.com/npc=16643/razia
+SET @ENTRY := 16643;
+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,25,0,100,0,0,0,0,0,53,0,16643,1,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,1,16643,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,3,16643,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Waypoint 3 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,6,16643,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Waypoint 6 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,9,16643,0,0,54,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Waypoint 9 Reached - Pause Waypoint"),
+(@ENTRY,0,5,0,64,0,100,0,0,0,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Gossip Hello - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1664300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Script - Play Emote 25");
+
+-- Actionlist SAI
+SET @ENTRY := 1664301;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Razia - On Script - Play Emote 1");
+
+DELETE FROM `waypoints` WHERE `entry`=16643;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(16643, 1, 10013.3, -7214.86, 32.0748, 'Razia'),
+(16643, 2, 10013.5, -7217.56, 32.0748, 'Razia'),
+(16643, 3, 10016.2, -7218.02, 32.0748, 'Razia'),
+(16643, 4, 10014.7, -7217.3, 32.0764,  'Razia'),
+(16643, 5, 10017.5, -7213.64, 32.0764, 'Razia'),
+(16643, 6, 10017.7, -7210.42, 32.0756, 'Razia'),
+(16643, 7, 10017.5, -7213.48, 32.0764, 'Razia'),
+(16643, 8, 10013.3, -7214.86, 32.0748, 'Razia'),
+(16643, 9, 10013.3, -7214.86, 32.0748, 'Razia');
+
+UPDATE `creature` SET `Spawndist` = 0, `MovementType` = 0 WHERE `guid` IN (57682, 57621);
diff --git a/sql/updates/world/master/2018_03_17_46_world_2017_01_01_03_world.sql b/sql/updates/world/master/2018_03_17_46_world_2017_01_01_03_world.sql
new file mode 100644
index 000000000..a088917b3
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_46_world_2017_01_01_03_world.sql
@@ -0,0 +1,81 @@
+-- Silvermoon City - Trainer Scripts
+DELETE FROM `waypoints` WHERE `entry`=16671;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES 
+(16671, 1, 9859.67, -7361.79, 18.5932),
+(16671, 2, 9858.73, -7363.12, 18.5903),
+(16671, 3, 9859.67, -7361.79, 18.5932),
+(16671, 4, 9859.67, -7361.79, 18.5932);
+
+-- Mirvedon SAI
+SET @ENTRY := 16671;
+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,25,0,100,0,0,0,0,0,53,0,16671,1,0,0,0,1,0,0,0,0,0,0,0,"Mirvedon - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,1,16671,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mirvedon - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,2,3,40,0,100,0,2,16671,0,0,54,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mirvedon - On Waypoint 2 Reached - Pause Waypoint"),
+(@ENTRY,0,3,0,61,0,100,0,2,16671,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mirvedon - On Waypoint 2 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,4,16671,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mirvedon - On Waypoint 4 Reached - Pause Waypoint"),
+(@ENTRY,0,5,0,64,0,100,0,0,0,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mirvedon - On Gossip Hello - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1667100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,3000,3000,0,0,17,173,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mirvedon - On Script - Set Emote State 173"),
+(@ENTRY,9,1,0,0,0,100,0,10000,10000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mirvedon - On Script - Set Emote State 0");
+
+DELETE FROM `waypoints` WHERE `entry`=16667;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES 
+(16667, 1, 9822.16, -7333.16, 26.3),
+(16667, 2, 9822.35, -7331.03, 26.2814),
+(16667, 3, 9820.39, -7329.52, 26.2814),
+(16667, 4, 9819.43, -7330.37, 26.2814),
+(16667, 5, 9820.59, -7329.88, 26.2814),
+(16667, 6, 9821.49, -7331.48, 26.2814),
+(16667, 7, 9821.25, -7331.97, 26.2814),
+(16667, 8, 9822.16, -7333.16, 26.3),
+(16667, 9, 9822.16, -7333.16, 26.3);
+
+-- Danwe SAI
+SET @ENTRY := 16667;
+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,25,0,100,0,0,0,0,0,53,0,16667,1,0,0,0,1,0,0,0,0,0,0,0,"Danwe - On Reset - Start Waypoint"),
+(@ENTRY,0,1,2,40,0,100,0,4,16667,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Danwe - On Waypoint 4 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,61,0,100,0,4,16667,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Danwe - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,3,4,40,0,100,0,7,16667,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Danwe - On Waypoint 7 Reached - Pause Waypoint"),
+(@ENTRY,0,4,0,61,0,100,0,7,16667,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Danwe - On Waypoint 7 Reached - Run Script"),
+(@ENTRY,0,5,0,64,0,100,0,0,0,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Danwe - On Gossip Hello - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1666700;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,75,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,"Danwe - On Script - Add Aura 'Kneel'"),
+(@ENTRY,9,1,0,0,0,100,0,26000,26000,0,0,28,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,"Danwe - On Script - Remove Aura 'Kneel'");
+
+-- Actionlist SAI
+SET @ENTRY := 1666701;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"),
+(@ENTRY,9,1,0,0,0,100,0,26000,26000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0");
+
+SET @NPC := 57637;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 10013.3, -7214.86, 32.0748),
+(@PATH, 2, 10013.5, -7217.56, 32.0748),
+(@PATH, 3, 10016.2, -7218.02, 32.0748),
+(@PATH, 4, 10014.7, -7217.3, 32.0764),
+(@PATH, 5, 10017.5, -7213.64, 32.0764),
+(@PATH, 6, 10017.7, -7210.42, 32.0756),
+(@PATH, 7, 10017.5, -7213.48, 32.0764),
+(@PATH, 8, 10013.3, -7214.86, 32.0748),
+(@PATH, 9, 10013.3, -7214.86, 32.0748);
diff --git a/sql/updates/world/master/2018_03_17_47_world_2017_01_01_04_world.sql b/sql/updates/world/master/2018_03_17_47_world_2017_01_01_04_world.sql
new file mode 100644
index 000000000..f31da46a2
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_47_world_2017_01_01_04_world.sql
@@ -0,0 +1,46 @@
+-- Brother Daniels SAI -- http://www.wowhead.com/npc=19447/brother-daniels
+SET @ENTRY := 19447;
+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,25,0,100,0,0,0,0,0,53,0,19447,1,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,2,19447,0,0,54,2000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Waypoint 2 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,3,19447,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Waypoint 3 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,5,19447,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Waypoint 5 Reached - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 1944700;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,155000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.47099,"Brother Daniels - On Script - Set Orientation 4.47099"),
+(@ENTRY,9,2,0,0,0,100,0,15000,15000,0,0,1,0,10000,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,15000,15000,0,0,75,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Set Flag Standstate Kneel"),
+(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,1,1,10000,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Say Line 1"),
+(@ENTRY,9,5,0,0,0,100,0,119000,119000,0,0,28,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Remove Flag Standstate Stand Up");
+
+-- Actionlist SAI
+SET @ENTRY := 1944701;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,155000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.00368,"Brother Daniels - On Script - Set Orientation 4.00368"),
+(@ENTRY,9,2,0,0,0,100,0,15000,15000,0,0,1,2,10000,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Say Line 2"),
+(@ENTRY,9,3,0,0,0,100,0,15000,15000,0,0,75,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Set Flag Standstate Kneel"),
+(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,1,3,10000,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Say Line 3"),
+(@ENTRY,9,5,0,0,0,100,0,119000,119000,0,0,28,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brother Daniels - On Script - Remove Flag Standstate Stand Up");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=19447;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+(19447, 0, 0, 'Light, lead the fallen from untruth to truth, from darkness to Light and from death to immortality.', 12, 0, 100, 0, 0, 0, 16769, 'Brother Daniels'),
+(19447, 1, 0, 'Light be with you now and forever.', 12, 0, 100, 0, 0, 0, 16770, 'Brother Daniels'),
+(19447, 2, 0, 'Light, give me strength.', 12, 0, 100, 0, 0, 0, 16767, 'Brother Daniels'),
+(19447, 3, 0, 'The priest kneels in silent prayer.', 16, 0, 100, 0, 0, 0, 16772, 'Brother Daniels');
+
+DELETE FROM `waypoints` WHERE `entry`=19447;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(19447, 1, -365.8, 980.679, 54.1955,   'Brother Daniels'),
+(19447, 2, -354.904, 978.248, 54.2496, 'Brother Daniels'),
+(19447, 3, -354.904, 978.248, 54.2496, 'Brother Daniels'),
+(19447, 4, -366.477, 980.557, 54.1895, 'Brother Daniels'),
+(19447, 5, -369.43, 977.106, 54.1679,  'Brother Daniels');
diff --git a/sql/updates/world/master/2018_03_17_48_world_2017_01_01_06_world.sql b/sql/updates/world/master/2018_03_17_48_world_2017_01_01_06_world.sql
new file mode 100644
index 000000000..8e562ccdc
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_48_world_2017_01_01_06_world.sql
@@ -0,0 +1,73 @@
+DELETE FROM `creature` WHERE `id` IN(22952,22950,22949,22951);
+DELETE FROM `creature_summon_groups` WHERE `summonerId`=23426; -- Illidari Council Trigger
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`) VALUES
+(23426,0,1,22952,697.495,310.651,277.527,3.1765 ,6,3600000), -- Veras Darkshadow
+(23426,0,1,22950,700.792,307.192,277.526,3.14159,6,3600000), -- High Nethermancer Zerevor
+(23426,0,1,22949,700.739,302.722,277.526,3.10669,6,3600000), -- Gathios the Shatterer
+(23426,0,1,22951,697.409,299.377,277.526,3.07178,6,3600000); -- Lady Malande
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=41333; -- Empyreal Equivalency
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,41333,0,0,31,0,3,22950,0,0,0,0,'','Effect_0 hits High Nethermancer Zerevor'),
+(13,1,41333,0,1,31,0,3,22949,0,0,0,0,'','Effect_0 hits Gathios the Shatterer'),
+(13,1,41333,0,2,31,0,3,22951,0,0,0,0,'','Effect_0 hits Lady Malande'),
+(13,1,41333,0,3,31,0,3,22952,0,0,0,0,'','Effect_0 hits Veras Darkshadow');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=41499; --  Empyreal Balance
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,41499,0,0,31,0,3,22950,0,0,0,0,'','Effect_0 hits High Nethermancer Zerevor'),
+(13,1,41499,0,1,31,0,3,22949,0,0,0,0,'','Effect_0 hits Gathios the Shatterer'),
+(13,1,41499,0,2,31,0,3,22951,0,0,0,0,'','Effect_0 hits Lady Malande'),
+(13,1,41499,0,3,31,0,3,22952,0,0,0,0,'','Effect_0 hits Veras Darkshadow');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=41342; -- Shared Rule
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,41342,0,0,31,0,3,23426,0,0,0,0,'','Effect_0 hits The Illidari Council');
+
+UPDATE `linked_respawn` SET `linkedGuid`=52479 WHERE `linkedGuid`=52762;
+
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128, `ScriptName`='npc_veras_vanish_effect' WHERE `entry`=23451;
+UPDATE `creature_template` SET `ScriptName`='boss_illidari_council' WHERE `entry`=23426;
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=23499;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN(
+'spell_illidari_council_empyreal_balance',
+'spell_illidari_council_empyreal_equivalency',
+'spell_illidari_council_balance_of_power',
+'spell_illidari_council_deadly_strike',
+'spell_illidari_council_deadly_poison',
+'spell_illidari_council_judgement',
+'spell_illidari_council_seal',
+'spell_boss_lady_malande_shield',
+'spell_illidari_council_reflective_shield',
+'spell_illidari_dampen_magic');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(41499,'spell_illidari_council_empyreal_balance'),
+(41333,'spell_illidari_council_empyreal_equivalency'),
+(41341,'spell_illidari_council_balance_of_power'),
+(41480,'spell_illidari_council_deadly_strike'),
+(41485,'spell_illidari_council_deadly_poison'),
+(41467,'spell_illidari_council_judgement'),
+(41469,'spell_illidari_council_seal'),
+(41459,'spell_illidari_council_seal'),
+(41475,'spell_illidari_council_reflective_shield'),
+(41478,'spell_illidari_dampen_magic');
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN(22951,22949,22950,22952) AND (`GroupID` IN(3,4,5,6) OR (`GroupID`=2 AND `ID`=1));
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`Comment`) VALUES
+(22949,2,1,'You are MINE!',14,0,100,0,0,11427,21739,0,'council gath SPECIAL2'),
+(22949,3,0,'Selama am\'oronor!',14,0,100,0,0,11423,21735,0,'council gath SLAY'),
+(22949,4,0,'Well done!',14,0,100,0,0,11424,21736,0,'council gath SLAY_COMT'),
+(22949,5,0,'Lord Illidan, I...',14,0,100,0,0,11425,21737,0,'council gath DEATH'),
+(22951,2,1,'I\'m full of surprises!',14,0,100,0,0,11487,21719,0,'council mala SPECIAL2'),
+(22951,3,0,'My work is done.',14,0,100,0,0,11483,21712,0,'council mala SLAY'),
+(22951,4,0,'As it should be.',14,0,100,0,0,11484,21713,0,'council mala SLAY_COMT'),
+(22951,5,0,'Destiny... awaits.',14,0,100,0,0,11485,21715,0,'council mala DEATH'),
+(22950,2,1,'Sha\'amoor ara mashal?',14,0,100,0,0,11445,21731,0,'council zere SPECIAL2'),
+(22950,3,0,'Shorel\'aran.',14,0,100,0,0,11441,21725,0,'council zere SLAY'),
+(22950,4,0,'Belesa menoor!',14,0,100,0,0,11442,21727,0,'council zere SLAY_COMT'),
+(22950,5,0,'Diel ma\'ahn... orindel\'o.',14,0,100,0,0,11443,21729,0,'council zere DEATH'),
+(22952,2,1,'Anar\'alah belore!',14,0,100,0,0,11529,21705,0,'council vera SPECIAL2'),
+(22952,3,0,'Valiant effort.',14,0,100,0,0,11525,21699,0,'council vera SLAY'),
+(22952,4,0,'A glorious kill!',14,0,100,0,0,11526,21701,0,'council vera SLAY_COMT'),
+(22952,5,0,'You got... lucky.',14,0,100,0,0,11527,21703,0,'council vera DEATH');
diff --git a/sql/updates/world/master/2018_03_17_49_world_2017_01_01_07_world.sql b/sql/updates/world/master/2018_03_17_49_world_2017_01_01_07_world.sql
new file mode 100644
index 000000000..3395b5807
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_49_world_2017_01_01_07_world.sql
@@ -0,0 +1,13 @@
+DELETE FROM `linked_respawn` WHERE `guid`IN(201369,201493,201577,201286);
+DELETE FROM `creature` WHERE `id` IN(37973,37972,37970);
+DELETE FROM `creature_summon_groups` WHERE `summonerId`=38008; -- Blood orb controller
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`) VALUES
+(38008,0,1,37973,4682.89,2755.11,364.17,3.14159 ,6,3600000), -- Taldaram
+(38008,0,1,37972,4682.73,2783.42,364.17,3.14159,6,3600000), -- Keleseth
+(38008,0,1,37970,4680.29,2769.24,364.17,3.14159,6,3600000); -- Valanar
+
+DELETE FROM spell_proc WHERE SpellId=72059;
+INSERT INTO spell_proc (SpellId, SchoolMask, SpellFamilyName, SpellFamilyMask0, SpellFamilyMask1, SpellFamilyMask2, ProcFlags, SpellTypeMask, SpellPhaseMask, HitMask, AttributesMask, ProcsPerMinute, Chance, Cooldown, Charges) VALUES
+(72059, 0, 0, 0x0, 0x0, 0x0, 0, 0x1, 0x2, 0x403, 0x2, 0, 0, 0, 0); -- Unstable
+
+UPDATE `creature_template` SET `speed_walk`=0.4, `speed_run`=0.142857 WHERE `entry` IN (38454,38775); -- normal kinetic
diff --git a/sql/updates/world/master/2018_03_17_50_world_2017_01_02_00_world.sql b/sql/updates/world/master/2018_03_17_50_world_2017_01_02_00_world.sql
new file mode 100644
index 000000000..1b2b2bf89
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_50_world_2017_01_02_00_world.sql
@@ -0,0 +1,48 @@
+-- Harene Plainwalker -- http://www.wowhead.com/npc=16655/harene-plainwalker#comments
+UPDATE `creature_template_addon` SET `emote`=0 WHERE `entry`=16655;
+
+-- Harene Plainwalker SAI
+SET @ENTRY := 16655;
+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,25,0,100,0,0,0,0,0,53,0,16655,1,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,1,16655,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,3,16655,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Waypoint 3 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,7,16655,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Waypoint 7 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,11,16655,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Waypoint 11 Reached - Run Script"),
+(@ENTRY,0,5,0,40,0,100,0,14,16655,0,0,54,60000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Waypoint 14 Reached - Pause Waypoint"),
+(@ENTRY,0,6,0,64,0,100,0,0,0,0,0,54,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Gossip Hello - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1665500;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,54,0,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Script - Set Emote State 133"),
+(@ENTRY,9,2,0,0,0,100,0,25000,25000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Script - Set Emote State 0");
+
+-- Actionlist SAI
+SET @ENTRY := 1665501;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,75,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Script - Add Aura 'Kneel'"),
+(@ENTRY,9,2,0,0,0,100,0,25000,25000,0,0,28,68442,0,0,0,0,0,1,0,0,0,0,0,0,0,"Harene Plainwalker - On Script - Remove Aura 'Kneel'");
+
+DELETE FROM `waypoints` WHERE `entry`=16655;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(16655, 1, 9703.85, -7267.49, 16.1144,  'Harene Plainwalker'),
+(16655, 2, 9703.63, -7263.83, 15.9914,  'Harene Plainwalker'),
+(16655, 3, 9706.74, -7261.86, 16.5287,  'Harene Plainwalker'),
+(16655, 4, 9703.75, -7263.42, 16.0209,  'Harene Plainwalker'),
+(16655, 5, 9701.5, -7261.56, 15.9065,   'Harene Plainwalker'),
+(16655, 6, 9698.97, -7258.35, 15.599,   'Harene Plainwalker'),
+(16655, 7, 9698.97, -7258.35, 15.599,   'Harene Plainwalker'),
+(16655, 8, 9700.7, -7261.93, 15.7977,   'Harene Plainwalker'),
+(16655, 9, 9703.63, -7266.76, 16.0817,  'Harene Plainwalker'),
+(16655, 10, 9701.12, -7272.78, 15.8364, 'Harene Plainwalker'),
+(16655, 11, 9700.66, -7278.72, 15.5704, 'Harene Plainwalker'),
+(16655, 12, 9701.32, -7272.86, 15.8672, 'Harene Plainwalker'),
+(16655, 13, 9703.85, -7267.49, 16.1144, 'Harene Plainwalker'),
+(16655, 14, 9703.85, -7267.49, 16.1144, 'Harene Plainwalker');
diff --git a/sql/updates/world/master/2018_03_17_51_world_2017_01_02_01_world.sql b/sql/updates/world/master/2018_03_17_51_world_2017_01_02_01_world.sql
new file mode 100644
index 000000000..13f0b1144
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_51_world_2017_01_02_01_world.sql
@@ -0,0 +1,94 @@
+-- Silvermoon City - Trainer Update 3
+-- Welethelon <Blunt Weapon Merchant>
+UPDATE `creature` SET position_x = 9665.084, position_y = -7073.852, position_z = 14.32864, orientation = 4.869938, Spawndist = 0, MovementType = 2 WHERE guid = 57631;
+SET @NPC := 57631;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 9665.08, -7073.85, 14.3286,0),
+(@PATH, 2, 9663.17, -7075.62, 14.3327,0),
+(@PATH, 3, 9662.24, -7078.38, 14.3211,5000),
+(@PATH, 4, 9668.51, -7079.23, 14.3343,0),
+(@PATH, 5, 9668.51, -7079.23, 14.3343,5000),
+(@PATH, 6, 9666.14, -7076.94, 14.3352,0),
+(@PATH, 7, 9665.08, -7073.85, 14.3286,0),
+(@PATH, 8, 9665.08, -7073.85, 14.3286,10000);
+
+-- Noraelath <Leather Armor Merchant>
+UPDATE `creature` SET position_x = 9651.68, position_y = -7070.56, position_z = 14.3104, orientation = 4.01189, Spawndist = 0, MovementType = 2 WHERE guid = 57680;
+SET @NPC := 57680;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 9651.68, -7070.56, 14.3104,10000),
+(@PATH, 2, 9650.83, -7073.55, 14.3112,0),
+(@PATH, 3, 9649.54, -7070.92, 14.3095,0),
+(@PATH, 4, 9648.21, -7071.54, 14.3092,10000),
+(@PATH, 5, 9651.68, -7070.56, 14.3104,0),
+(@PATH, 6, 9651.68, -7070.56, 14.3104,5000);
+
+-- Rahein <Blade Vendor>
+DELETE FROM `waypoints` WHERE `entry`=16678;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES 
+(16678, 1, 9630.69, -7032.97, 15.2687),
+(16678, 2, 9636.05, -7031.66, 15.2674),
+(16678, 3, 9630.66, -7032.19, 15.2674),
+(16678, 4, 9627.83, -7031.5, 15.2674),
+(16678, 5, 9630.69, -7032.97, 15.2687),
+(16678, 6, 9630.69, -7032.97, 15.2687);
+
+-- Rahein SAI
+SET @ENTRY := 16678;
+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,25,0,100,0,0,0,0,0,53,0,16678,1,0,0,0,1,0,0,0,0,0,0,0,"Rahein - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,4,16678,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rahein - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,2,0,64,0,100,0,0,0,0,0,54,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rahein - On Gossip Hello - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1667800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,40000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"),
+(@ENTRY,9,2,0,0,0,100,0,35000,35000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0");
+
+-- Feledis <Axe Vendor>
+DELETE FROM `waypoints` WHERE `entry`=16666;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES 
+(16666, 1, 9644.87, -7037.51, 15.2466),
+(16666, 2, 9649.12, -7037.71, 15.247),
+(16666, 3, 9649.12, -7037.71, 15.247),
+(16666, 4, 9649.84, -7036.01, 15.2545),
+(16666, 5, 9650.34, -7034.34, 15.2614),
+(16666, 6, 9647.34, -7032.51, 15.2673),
+(16666, 7, 9647.34, -7032.51, 15.2673),
+(16666, 8, 9644.26, -7032.12, 15.2673),
+(16666, 9, 9643.18, -7034.19, 15.2648),
+(16666, 10, 9643.12, -7036.25, 15.254),
+(16666, 11, 9644.87, -7037.51, 15.2466),
+(16666, 12, 9644.87, -7037.51, 15.2466);
+
+-- Feledis SAI
+SET @ENTRY := 16666;
+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,25,0,100,0,0,0,0,0,53,0,16666,1,0,0,0,1,0,0,0,0,0,0,0,"Feledis - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,4,16666,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Feledis - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,2,0,64,0,100,0,0,0,0,0,54,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Feledis - On Gossip Hello - Pause Waypoint");
+
+-- Actionlist SAI
+SET @ENTRY := 1666600;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,45000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"),
+(@ENTRY,9,2,0,0,0,100,0,41000,41000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0");
diff --git a/sql/updates/world/master/2018_03_17_52_world_2017_01_02_02_world.sql b/sql/updates/world/master/2018_03_17_52_world_2017_01_02_02_world.sql
new file mode 100644
index 000000000..ace6e9fcb
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_52_world_2017_01_02_02_world.sql
@@ -0,0 +1,175 @@
+-- Fleshfiend
+SET @CGUID := 77792; -- 12 FREE GUIDS NEEDED SET BY TC TEAM
+DELETE FROM `creature` WHERE `guid` NOT IN (72253, 72254, 72255) AND `id`=20340;
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+11;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `curhealth`, `curmana`, `MovementType`) VALUES 
+(@CGUID+0, 20340, 530, 1, 0, 3700.07, 2104.38, 154.187, 1.05376, 300, 0, 6761, 0, 2),
+(@CGUID+1, 20340, 530, 1, 0, 3802, 2077.1, 149.618, 2.7682, 300, 5, 6986, 0, 1),
+(@CGUID+2, 20340, 530, 1, 0, 3757.67, 2080.25, 151.914, 3.0616, 300, 2, 6986, 0, 1),
+(@CGUID+3, 20340, 530, 1, 0, 3830.72, 2152.55, 145.842, 4.57919, 300, 5, 6986, 0, 1),
+(@CGUID+4, 20340, 530, 1, 0, 3845.32, 2111.13, 148.712, 3.38892, 300, 0, 6761, 0, 2),
+(@CGUID+5, 20340, 530, 1, 0, 3864.73, 2158.55, 139.53, 5.98851, 300, 5, 6761, 0, 1),
+(@CGUID+6, 20340, 530, 1, 0, 3883.87, 2131.02, 133.884, 5.14029, 300, 5, 6761, 0, 1),
+(@CGUID+7, 20340, 530, 1, 0, 3873.85, 2104.63, 133.388, 4.74834, 300, 0, 6986, 0, 2),
+(@CGUID+8, 20340, 530, 1, 0, 3919.83, 2087.85, 133.488, 2.46537, 300, 5, 6761, 0, 1),
+(@CGUID+9, 20340, 530, 1, 0, 3895.68, 2034.48, 148.256, 3.45105, 300, 5, 6761, 0, 1),
+(@CGUID+10, 20340, 530, 1, 0, 3909.46, 2090.17, 155.839, 2.58317, 300, 5, 6986, 0, 1),
+(@CGUID+11, 20340, 530, 1, 0, 3927.87, 2118.67, 159.924, 4.58354, 300, 0, 6761, 0, 2);
+
+-- Updates
+UPDATE `creature` SET `spawndist` = 0, `MovementType` = 0 WHERE guid = 72253;
+UPDATE `creature` SET `position_x` = 3845.784424, `position_y` = 2111.566895, `position_z` = 148.651016, `spawndist` = 5, `MovementType` = 1 WHERE `guid` = 72254;
+
+SET @NPC := 72253;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 3828.6, 2052.43, 146.299),
+(@PATH, 2, 3814.57, 2068.55, 148.037),
+(@PATH, 3, 3803.64, 2075.73, 148.999),
+(@PATH, 4, 3793.57, 2076.63, 152.807),
+(@PATH, 5, 3772.9, 2078.11, 154.741),
+(@PATH, 6, 3793.79, 2077.36, 152.872),
+(@PATH, 7, 3806.68, 2075.38, 148.988),
+(@PATH, 8, 3817.08, 2066.81, 147.837),
+(@PATH, 9, 3829.58, 2051.22, 145.945),
+(@PATH, 10, 3837.99, 2045.38, 144.981),
+(@PATH, 11, 3844.06, 2036.32, 143.92),
+(@PATH, 12, 3853.07, 2030.52, 142.777),
+(@PATH, 13, 3865.79, 2024.48, 144.208),
+(@PATH, 14, 3851.93, 2030.9, 142.805),
+(@PATH, 15, 3844.37, 2036.31, 143.849),
+(@PATH, 16, 3838.85, 2044.04, 144.628);
+
+SET @NPC := @CGUID+0;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 3708.42, 2110.91, 152.714),
+(@PATH, 2, 3718.47, 2112.17, 150.762),
+(@PATH, 3, 3738.52, 2109.59, 148.183),
+(@PATH, 4, 3711.96, 2112.24, 152.367),
+(@PATH, 5, 3702.12, 2107.95, 153.659),
+(@PATH, 6, 3692.42, 2098.89, 155.214),
+(@PATH, 7, 3686.26, 2093.03, 149.364),
+(@PATH, 8, 3683.91, 2089.67, 152.259),
+(@PATH, 9, 3688.53, 2083.23, 152.775),
+(@PATH, 10, 3698.57, 2069.71, 150.483),
+(@PATH, 11, 3715.1, 2062.27, 147.368),
+(@PATH, 12, 3728.18, 2056.63, 144.842),
+(@PATH, 13, 3740.76, 2052.12, 146.617),
+(@PATH, 14, 3756.8, 2056.43, 150.487),
+(@PATH, 15, 3741.21, 2052.22, 146.648),
+(@PATH, 16, 3727.44, 2056.94, 144.813),
+(@PATH, 17, 3698.21, 2070.22, 150.638),
+(@PATH, 18, 3689.34, 2085.61, 152.047),
+(@PATH, 19, 3687.46, 2092.86, 149.402),
+(@PATH, 20, 3690.78, 2097.36, 154.156),
+(@PATH, 21, 3700.04, 2104.35, 154.194);
+
+SET @NPC := @CGUID+4;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 3832.22, 2107.48, 149.717),
+(@PATH, 2, 3825.75, 2105.58, 151.003),
+(@PATH, 3, 3820.36, 2104.75, 148.444),
+(@PATH, 4, 3811.88, 2098.79, 147.848),
+(@PATH, 5, 3804.56, 2091.55, 149.842),
+(@PATH, 6, 3813.68, 2099.89, 147.724),
+(@PATH, 7, 3820.93, 2105.03, 148.563),
+(@PATH, 8, 3825.93, 2106.17, 151.103),
+(@PATH, 9, 3832.41, 2107.12, 149.743),
+(@PATH, 10, 3843.08, 2112.63, 148.908),
+(@PATH, 11, 3843.73, 2122.31, 147.232),
+(@PATH, 12, 3839.65, 2131.35, 146.628),
+(@PATH, 13, 3837.69, 2138.62, 145.446),
+(@PATH, 14, 3832.25, 2154.89, 145.916),
+(@PATH, 15, 3838.13, 2137.13, 145.727),
+(@PATH, 16, 3842.26, 2122.59, 147.082),
+(@PATH, 17, 3846.68, 2115.09, 148.459),
+(@PATH, 18, 3855.48, 2114.4, 147.42),
+(@PATH, 19, 3870.42, 2114.12, 147.612),
+(@PATH, 20, 3885.1, 2109.86, 149.593),
+(@PATH, 21, 3893.09, 2104.7, 152.478),
+(@PATH, 22, 3903.74, 2097.1, 154.744),
+(@PATH, 23, 3895.22, 2104.42, 153.216),
+(@PATH, 24, 3883.14, 2110.8, 149.206),
+(@PATH, 25, 3867.52, 2114.77, 147.194),
+(@PATH, 26, 3852.24, 2113.81, 147.649),
+(@PATH, 27, 3846.62, 2115.55, 148.453),
+(@PATH, 28, 3840.54, 2128.64, 146.783),
+(@PATH, 29, 3837.58, 2140.16, 145.256),
+(@PATH, 30, 3832.01, 2155.39, 145.949),
+(@PATH, 31, 3837.48, 2140.4, 145.27);
+
+SET @NPC := @CGUID+7;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 3874.85, 2092.38, 131.986),
+(@PATH, 2, 3881.79, 2076.72, 132.069),
+(@PATH, 3, 3876.13, 2088.46, 131.757),
+(@PATH, 4, 3873.89, 2102.41, 132.905),
+(@PATH, 5, 3875.56, 2109.94, 135.03),
+(@PATH, 6, 3879.99, 2120.42, 133.436),
+(@PATH, 7, 3882.52, 2130.11, 133.948),
+(@PATH, 8, 3877.94, 2139.1, 135.257),
+(@PATH, 9, 3876.27, 2145.36, 139.053),
+(@PATH, 10, 3874.56, 2152.62, 138.963),
+(@PATH, 11, 3867.19, 2159.01, 139.152),
+(@PATH, 12, 3857.43, 2157.18, 140.557),
+(@PATH, 13, 3846.26, 2156.16, 141.191),
+(@PATH, 14, 3842.13, 2158.58, 141.856),
+(@PATH, 15, 3848.25, 2155.62, 140.979),
+(@PATH, 16, 3858.78, 2157.24, 140.533),
+(@PATH, 17, 3872.4, 2155.03, 138.92),
+(@PATH, 18, 3875.87, 2150.28, 139.98),
+(@PATH, 19, 3876.41, 2145.97, 139.209),
+(@PATH, 20, 3878.13, 2140.38, 135.46),
+(@PATH, 21, 3882.97, 2129.62, 133.867),
+(@PATH, 22, 3880.17, 2118.79, 133.545),
+(@PATH, 23, 3875.72, 2110.03, 134.98),
+(@PATH, 24, 3874.23, 2103.02, 132.96);
+
+SET @NPC := @CGUID+11;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 3923.03, 2102, 158.719),
+(@PATH, 2, 3918.22, 2094.92, 157.148),
+(@PATH, 3, 3909.27, 2086.84, 156.194),
+(@PATH, 4, 3908.21, 2079.6, 153.654),
+(@PATH, 5, 3907.09, 2069.95, 152.617),
+(@PATH, 6, 3906.22, 2058.27, 150.862),
+(@PATH, 7, 3901.95, 2047.35, 149.152),
+(@PATH, 8, 3907.01, 2060.82, 151.077),
+(@PATH, 9, 3907.93, 2080.42, 153.756),
+(@PATH, 10, 3909.4, 2086.92, 156.191),
+(@PATH, 11, 3913.55, 2091.18, 155.927),
+(@PATH, 12, 3920.32, 2096.83, 157.939),
+(@PATH, 13, 3926.47, 2109.47, 159.1),
+(@PATH, 14, 3927.97, 2121.86, 160.375),
+(@PATH, 15, 3930.43, 2129, 160.119),
+(@PATH, 16, 3940.05, 2136.96, 160.067),
+(@PATH, 17, 3952.66, 2135.78, 161.632),
+(@PATH, 18, 3957.72, 2133.09, 162.299),
+(@PATH, 19, 3946.18, 2137.7, 160.791),
+(@PATH, 20, 3936.69, 2136.25, 160.133),
+(@PATH, 21, 3928.27, 2125.16, 160.584),
+(@PATH, 22, 3927.47, 2118.3, 159.805);
diff --git a/sql/updates/world/master/2018_03_17_53_world_2017_01_02_03_world.sql b/sql/updates/world/master/2018_03_17_53_world_2017_01_02_03_world.sql
new file mode 100644
index 000000000..edbfcb491
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_53_world_2017_01_02_03_world.sql
@@ -0,0 +1,47 @@
+-- [Q] The Flesh Lies... 
+-- Withered Corpse SAI
+SET @ENTRY := 20561;
+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,1,8,0,100,0,35372,0,0,0,33,20561,0,0,0,0,0,7,0,0,0,0,0,0,0,"Withered Corpse - On Spellhit 'Protectorate Igniter' - Quest Credit 'The Flesh Lies...''"),
+(@ENTRY,0,1,2,61,0,100,0,35372,0,0,0,50,184445,60,0,0,0,0,1,0,0,0,0,0,0,0,"Withered Corpse - On Spellhit 'Protectorate Igniter' - Summon Gameobject 'Charred Remains'"),
+(@ENTRY,0,2,0,61,0,100,0,35372,0,0,0,51,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Withered Corpse - On Spellhit 'Protectorate Igniter' - Kill Target"),
+(@ENTRY,0,3,4,10,0,100,1,0,4,0,0,12,20335,3,120000,0,0,0,1,0,0,0,0,0,0,0,"Withered Corpse - Within 0-4 Range Out of Combat LoS - Summon Creature 'Parasitic Fleshbeast'"),
+(@ENTRY,0,4,5,61,0,100,0,0,4,0,0,11,35309,0,0,0,0,0,1,0,0,0,0,0,0,0,"Withered Corpse - Within 0-4 Range Out of Combat LoS - Cast 'Bloody Explosion'"),
+(@ENTRY,0,5,0,61,0,100,0,0,4,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Withered Corpse - Within 0-4 Range Out of Combat LoS - Despawn In 1000 ms");
+
+DELETE FROM `creature_template_addon` WHERE `entry`=20561;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(20561, 0, 0, 3, 1, 0, '29266');
+
+-- respawn creatures correctly
+SET @CGUID := 77881; -- 25 spawns set by TC TEAM
+DELETE FROM `creature` WHERE `id`=20561;
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+24;
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES 
+(@CGUID+0, 20561, 530, 0, 0, 1, 0, 0, 3711.35, 2096.57, 151.984, 1.18682, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+1, 20561, 530, 0, 0, 1, 0, 0, 3737.86, 2082.16, 148.9, 0.837758, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+2, 20561, 530, 0, 0, 1, 0, 0, 3750.9, 2055.32, 148.853, 5.44543, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+3, 20561, 530, 0, 0, 1, 0, 0, 3760.86, 2082.87, 152.837, 2.40855, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+4, 20561, 530, 0, 0, 1, 0, 0, 3790.07, 2073.02, 153.16, 4.60767, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+5, 20561, 530, 0, 0, 1, 0, 0, 3815.1, 2102.61, 148.003, 1.72788, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+6, 20561, 530, 0, 0, 1, 0, 0, 3823.88, 2064.43, 147.579, 6.21337, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+7, 20561, 530, 0, 0, 1, 0, 0, 3835.91, 2045.9, 145.151, 0.942478, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+8, 20561, 530, 0, 0, 1, 0, 0, 3839.54, 2137.05, 145.967, 3.54302, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+9, 20561, 530, 0, 0, 1, 0, 0, 3849.06, 2147.26, 140.311, 4.31096, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+10, 20561, 530, 0, 0, 1, 0, 0, 3853.08, 2153.72, 140.589, 0.418879, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+11, 20561, 530, 0, 0, 1, 0, 0, 3863.25, 2120.24, 146.842, 5.46288, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+12, 20561, 530, 0, 0, 1, 0, 0, 3867.95, 2023.28, 144.585, 5.65487, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+13, 20561, 530, 0, 0, 1, 0, 0, 3870.96, 2103.97, 133.353, 1.58825, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+14, 20561, 530, 0, 0, 1, 0, 0, 3875.74, 2150.16, 139.272, 3.61283, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+15, 20561, 530, 0, 0, 1, 0, 0, 3881.19, 2078.43, 131.736, 3.66519, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+16, 20561, 530, 0, 0, 1, 0, 0, 3890.49, 2102.26, 153.708, 4.62512, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+17, 20561, 530, 0, 0, 1, 0, 0, 3902.53, 2052.92, 150.162, 3.21141, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+18, 20561, 530, 0, 0, 1, 0, 0, 3903.43, 2124.28, 137.706, 0.244346, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+19, 20561, 530, 0, 0, 1, 0, 0, 3908.28, 2081.01, 133.479, 4.18879, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+20, 20561, 530, 0, 0, 1, 0, 0, 3912.87, 2079.35, 153.77, 1.37881, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+21, 20561, 530, 0, 0, 1, 0, 0, 3926.43, 2105.75, 159.264, 3.61283, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+22, 20561, 530, 0, 0, 1, 0, 0, 3935.88, 2138.8, 160.69, 1.23918, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+23, 20561, 530, 0, 0, 1, 0, 0, 3968.76, 2112.71, 162.382, 6.19592, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(@CGUID+24, 20561, 530, 0, 0, 1, 0, 0, 3987.21, 2132.56, 162.681, 3.40339, 120, 0, 0, 1, 0, 0, 0, 0, 0);
diff --git a/sql/updates/world/master/2018_03_17_54_world_2017_01_02_04_world.sql b/sql/updates/world/master/2018_03_17_54_world_2017_01_02_04_world.sql
new file mode 100644
index 000000000..dfac0bcf0
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_54_world_2017_01_02_04_world.sql
@@ -0,0 +1,11 @@
+-- Protectorate Tracer -- http://wotlk.openwow.com/object=184447
+DELETE FROM `gameobject` WHERE `guid` IN (5,15,20,24,28,30,32,34);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES 
+(5, 184447, 530, 1, 3793.59, 2079.87, 153.262, 3.61391, 0, 0, -0.968147, 0.250381, 300, 255, 1),
+(15, 184447, 530, 1, 3801.51, 2087.91, 150.493, 4.7822, 0, 0, -0.681998, 0.731354, 300, 255, 1),
+(20, 184447, 530, 1, 3836.21, 2111.1, 149.73, 3.52557, 0, 0, -0.981627, 0.190812, 300, 255, 1),
+(24, 184447, 530, 1, 3819.34, 2098.08, 147.986, 3.15906, 0, 0, -0.999962, 0.00873464, 300, 255, 1),
+(28, 184447, 530, 1, 3855.51, 2154.05, 140.302, 3.05433, 0, 0, 0.999048, 0.0436193, 300, 255, 1),
+(30, 184447, 530, 1, 3876.8, 2152.48, 139.198, 2.46091, 0, 0, 0.942641, 0.333808, 300, 255, 1),
+(32, 184447, 530, 1, 3891.8, 2124.59, 134.586, 2.32129, 0, 0, 0.91706, 0.39875, 300, 255, 1),
+(34, 184447, 530, 1, 3907.58, 2105.97, 138.454, 5.25344, 0, 0, -0.492423, 0.870356, 300, 255, 1);
diff --git a/sql/updates/world/master/2018_03_17_55_world_2017_01_02_05_world.sql b/sql/updates/world/master/2018_03_17_55_world_2017_01_02_05_world.sql
new file mode 100644
index 000000000..18d952eeb
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_55_world_2017_01_02_05_world.sql
@@ -0,0 +1,7 @@
+-- Rot Hide Gnoll SAI
+SET @ENTRY := 1674;
+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,7000,21000,120000,125000,11,3237,0,0,0,0,0,2,0,0,0,0,0,0,0,"Rot Hide Gnoll - In Combat - Cast 'Curse of Thule'"),
+(@ENTRY,0,1,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Rot Hide Gnoll - Between 0-15% Health - Flee For Assist (No Repeat)");
diff --git a/sql/updates/world/master/2018_03_17_56_world_2017_01_02_06_world.sql b/sql/updates/world/master/2018_03_17_56_world_2017_01_02_06_world.sql
new file mode 100644
index 000000000..639855e61
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_56_world_2017_01_02_06_world.sql
@@ -0,0 +1,9 @@
+-- Rajah Haghazed SAI
+SET @ENTRY := 18046;
+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,1,0,0,0,0,11,35472,0,0,0,0,0,2,0,0,0,0,0,0,0,"Rajah Haghazed - On Aggro - Cast 'Shield Charge' (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,3000,4000,9000,10000,11,35473,0,0,0,0,0,2,0,0,0,0,0,0,0,"Rajah Haghazed - In Combat - Cast 'Forceful Cleave'"),
+(@ENTRY,0,2,0,0,0,100,0,7000,9000,15000,16000,11,16856,0,0,0,0,0,2,0,0,0,0,0,0,0,"Rajah Haghazed - In Combat - Cast 'Mortal Strike'"),
+(@ENTRY,0,3,0,2,0,100,0,0,40,16000,21000,11,15062,1,0,0,0,0,1,0,0,0,0,0,0,0,"Rajah Haghazed - Between 0-40% Health - Cast 'Shield Wall'");
diff --git a/sql/updates/world/master/2018_03_17_57_world_2017_01_02_07_world.sql b/sql/updates/world/master/2018_03_17_57_world_2017_01_02_07_world.sql
new file mode 100644
index 000000000..e794a4417
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_57_world_2017_01_02_07_world.sql
@@ -0,0 +1,12 @@
+-- 
+DELETE FROM `creature` WHERE `guid` IN (52762, 52763, 52764, 52765, 77804);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `curhealth`, `curmana`, `MovementType`) VALUES 
+(52762, 21636, 530, 1, 0, -3049.0556, 4495.867, -42.944, 6.090739, 600, 0, 5914, 0, 0),
+(52763, 21636, 530, 1, 0, -2980.0466, 4363.27, -49.227, 1.616328, 600, 0, 5914, 0, 0),
+(52764, 21636, 530, 1, 0, -2961.9802, 4363.849, -49.227, 1.886506, 600, 0, 5914, 0, 0),
+(52765, 21636, 530, 1, 0, -2962.7990, 4378.178, -49.227, 3.089739, 600, 0, 5914, 0, 0),
+(77804, 21636, 530, 1, 0, -2981.7517, 4378.619, -49.227, 6.209339, 600, 0, 5914, 0, 0);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=21636;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(21636, 0, 0, 0, 1, 0, '17327');
diff --git a/sql/updates/world/master/2018_03_17_58_world_2017_01_02_08_world.sql b/sql/updates/world/master/2018_03_17_58_world_2017_01_02_08_world.sql
new file mode 100644
index 000000000..67d31f75c
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_58_world_2017_01_02_08_world.sql
@@ -0,0 +1,4 @@
+-- 
+UPDATE `smart_scripts` SET `action_type`=11, `action_param1`=35374, `action_param2`=0 WHERE `entryorguid`=20561 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `event_param1`=0 WHERE `entryorguid`=1665500 AND `source_type`=9 AND `id`=0;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=14908 AND `source_type`=0 AND `id`=7;
diff --git a/sql/updates/world/master/2018_03_17_59_world_2017_01_02_09_world.sql b/sql/updates/world/master/2018_03_17_59_world_2017_01_02_09_world.sql
new file mode 100644
index 000000000..64412548c
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_59_world_2017_01_02_09_world.sql
@@ -0,0 +1,81 @@
+-- Coren Direbrew Implementation
+SET @CGUID := 77805;
+DELETE FROM `creature` WHERE `id`=23872 OR `guid`=@CGUID;
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES
+(@CGUID, 23872, 230, 0, 0, 2, 0, 1, 891.8394, -129.1829, -49.65985, 5.253441, 300, 0, 0, 0, 0, 2, 0, 0, 0, 0);
+
+DELETE FROM `creature_addon` WHERE `guid`=@CGUID;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(@CGUID,@CGUID*10,0,0,1,0,NULL);
+
+DELETE FROM `game_event_creature` WHERE `eventEntry`=24 AND `guid`=@CGUID;
+INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES
+(24,@CGUID);
+
+DELETE FROM `waypoint_data` WHERE `id` IN (@CGUID*10);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`action`,`action_chance`,`wpguid`) VALUES
+(@CGUID*10,0,888.4606, -130.909, -49.7434,0,0,0,100,0),
+(@CGUID*10,1,895.4048, -126.9586, -49.74198,0,0,0,100,0);
+
+UPDATE `gameobject_template` SET `ScriptName`='go_direbrew_mole_machine' WHERE `entry`=188508;
+UPDATE `gameobject_template` SET `displayId`=1287, `VerifiedBuild`=0 WHERE `entry`=188509;
+UPDATE `creature_template` SET `unit_flags`=33024 WHERE `entry`=23795;
+UPDATE `creature_template` SET `ScriptName`='npc_direbrew_antagonist' WHERE `entry`=23795;
+UPDATE `creature_template` SET `ScriptName`='npc_direbrew_minion' WHERE `entry`=26776;
+UPDATE `creature_template` SET `ScriptName`='npc_coren_direbrew_sisters' WHERE `entry` IN(26764,26822);
+UPDATE `creature_template` SET `unit_flags`=256, `MovementType`=2, `ScriptName`='boss_coren_direbrew' WHERE `entry`=23872;
+
+DELETE FROM `disables` WHERE `sourceType`=0 AND `entry`=50313;
+INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES
+(0,50313,64,0,0,'Disable LOS for Spell Mole Machine Emerge');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN(47344,52850);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,47344,0,0,31,0,3,26764,0,0,0,0,'','Spell Request Second mug targets Ilsa Direbrew'),
+(13,1,52850,0,0,31,0,3,23872,0,0,0,0,'','Spell Port to Coren target Coren Direbrew');
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN(23872,23795);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `Comment`) VALUES
+(23872, 0, 0, "This is an insult! An affront! They deny us participation in time-honored dwarven traditions!", 12, 0, 100, 15, 0, 0, 22376, 0, 'Coren Direbrew SAY_INTRO'),
+(23872, 1, 0, "Are we going to hide in our mountain and let those swill-peddlers have their little shindig without us?!", 12, 0, 100, 15, 0, 0, 22388, 0, 'Coren Direbrew SAY_INTRO2'),
+(23872, 2, 0, "DAMN RIGHT! We'll show 'em why you don't cross the Dark Iron dwarves!", 12, 0, 100, 15, 0, 0, 22389, 0, 'Coren Direbrew SAY_INTRO3'),
+(23872, 3, 0, "You'll pay for this insult, $c!", 12, 0, 100, 15, 0, 0, 25921, 0, 'Coren Direbrew SAY_INSULT'),
+(23795, 0, 0, "No way!", 12, 0, 100, 15, 0, 0, 22397, 0, 'Dark Iron Antagonist SAY_ANTAGONIST_1'),
+(23795, 0, 1, "NO!", 12, 0, 100, 15, 0, 0, 22399, 0, 'Dark Iron Antagonist SAY_ANTAGONIST_1'),
+(23795, 0, 2, "Not on your life", 12, 0, 100, 15, 0, 0, 22398, 0, 'Dark Iron Antagonist SAY_ANTAGONIST_1'),
+(23795, 1, 0, "Yeah!", 12, 0, 100, 15, 0, 0, 22393, 0, 'Dark Iron Antagonist SAY_ANTAGONIST_2'),
+(23795, 1, 1, "You said it!", 12, 0, 100, 15, 0, 0, 22395, 0, 'Dark Iron Antagonist SAY_ANTAGONIST_2'),
+(23795, 1, 2, "Damn straight!", 12, 0, 100, 15, 0, 0, 22396, 0, 'Dark Iron Antagonist SAY_ANTAGONIST_2'),
+(23795, 1, 3, "Right!", 12, 0, 100, 15, 0, 0, 22394, 0, 'Dark Iron Antagonist SAY_ANTAGONIST_2'),
+(23795, 2, 0, 'Never cross a Dark Iron, $C.', 12, 0, 50, 0, 0, 0, 1934, 0, 'Dark Iron Antagonist to Player'),
+(23795, 2, 1, 'Feel the power of the Dark Iron Dwarves!', 12, 0, 50, 0, 0, 0, 1936, 0, 'Dark Iron Antagonist to Player');
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (26764,26822);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(26764, 0, 0, 0, 1, 0, '47759 47760'),
+(26822, 0, 0, 0, 1, 0, '47759 47760');
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_direbrew_summon_mole_machine_target_picker',
+'spell_direbrew_disarm',
+'spell_send_mug_control_aura',
+'spell_send_mug_target_picker',
+'spell_request_second_mug',
+'spell_barreled_control_aura');
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(47407,'spell_direbrew_disarm'),
+(47691,'spell_direbrew_summon_mole_machine_target_picker'),
+(47369,'spell_send_mug_control_aura'),
+(47370,'spell_send_mug_target_picker'),
+(47344,'spell_request_second_mug'),
+(50278,'spell_barreled_control_aura');
+
+DELETE FROM  `gossip_menu_option` WHERE `MenuID` IN(11387,11388);
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionIndex`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES
+(11387, 0, 0, "Insult Coren Direbrew's brew.", 40431, 1, 1),
+(11388, 0, 0, "Fight", 40433, 1, 1),
+(11388, 1, 0, "Apologize", 40434, 1, 1);
+
+DELETE FROM `gossip_menu_option_action` WHERE `MenuId`=11387;
+INSERT INTO `gossip_menu_option_action` (`MenuId`, `OptionIndex`, `ActionMenuId`, `ActionPoiId`) VALUES
+(11387, 0, 11388, 0);
diff --git a/sql/updates/world/master/2018_03_17_60_world_2017_01_03_00_world.sql b/sql/updates/world/master/2018_03_17_60_world_2017_01_03_00_world.sql
new file mode 100644
index 000000000..3ba7d2788
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_60_world_2017_01_03_00_world.sql
@@ -0,0 +1,1111 @@
+-- 
+-- Remove Loot From NPC Who SHould Not Have Any
+DELETE FROM `creature_loot_template` WHERE `entry` IN 
+(8257,10717,10461,10536,10441,20117,
+3083, -- Honor Guard
+6021, -- Boar Spirit
+8257, -- Oozeling
+10636, -- Pack Kodo
+10925, -- Rotting Worm
+10943, -- Decrepit Guardian
+11054, -- Crimson Rifleman
+20158, -- Slime-Covered Corpse
+21040, -- Outraged Raven\'s Wood Sapling
+128, -- Angry Programmer Tweedle Dee
+197, -- Marshal McBride
+235, -- Salma Saldean
+240, -- Marshal Dughan
+246, -- \"Auntie\" Bernice Stonefield
+255, -- Gerard Tiller
+266, -- Wiley the Black
+275, -- Whit Wantmal
+288, -- Jitters
+313, -- Theocritus
+325, -- Hogan Ference
+341, -- Foreman Oslow
+358, -- Riding Wolf (Brown)
+359, -- Riding Wolf (Winter)
+379, -- Darcy
+381, -- Dockmaster Baren
+382, -- Marshal Marris
+415, -- Verner Osgood
+416, -- Imp
+417, -- Felhunter
+466, -- General Marcus Jonathan
+467, -- The Defias Traitor
+468, -- Town Crier
+469, -- Lieutenant Doren
+487, -- Protector Bialon
+488, -- Protector Weaver
+489, -- Protector Dutfield
+490, -- Protector Gariel
+494, -- Watcher Bukouris
+495, -- Watcher Keefer
+499, -- Watcher Paige
+659, -- El Pollo Grande
+698, -- Bloodscalp Tiger
+754, -- Rebel Watchman
+756, -- Skullsplitter Panther
+826, -- Watcher Jan
+827, -- Watcher Mocarski
+828, -- Watcher Petras
+853, -- Coldridge Mountaineer
+866, -- Stonard Grunt
+867, -- Stonard Cartographer
+869, -- Protector Dorana
+870, -- Protector Deni
+874, -- Protector Korelor
+876, -- Protector Leick
+885, -- Watcher Keller
+886, -- Watcher Hartin
+887, -- Watcher Jordan
+888, -- Watcher Dodds
+932, -- Guard Ashlock
+933, -- Guard Hiett
+934, -- Guard Clarke
+935, -- Guard Pearce
+936, -- Guard Adams
+999, -- Watcher Royce
+1001, -- Watcher Hutchins
+1064, -- Grom\'gol Grunt
+1066, -- Mottled Riptooth
+1071, -- Longbraid the Grim
+1073, -- Ashlan Stonesmirk
+1093, -- Chief Engineer Hinderweir VII
+1099, -- Watcher Gelwin
+1244, -- Rethiel the Greenwarden
+1245, -- Kogan Forgestone
+1276, -- Mountaineer Brokk
+1277, -- Mountaineer Ganin
+1278, -- Mountaineer Stenn
+1279, -- Mountaineer Flint
+1280, -- Mountaineer Droken
+1281, -- Mountaineer Zaren
+1282, -- Mountaineer Veek
+1283, -- Mountaineer Kalmir
+1327, -- Reese Langston
+1329, -- Mountaineer Naarh
+1330, -- Mountaineer Tyraw
+1331, -- Mountaineer Luxst
+1332, -- Mountaineer Morran
+1334, -- Mountaineer Hammerfall
+1335, -- Mountaineer Yuttha
+1336, -- Mountaineer Zwarn
+1337, -- Mountaineer Gwarth
+1338, -- Mountaineer Dalk
+1374, -- Rejold Barleybrew
+1414, -- Lisan Pierce
+1434, -- Menethil Sentry
+1436, -- Watcher Cutford
+1437, -- Thomas Booker
+1476, -- Hargin Mundar
+1477, -- Christoph Faral
+1481, -- Bart Tidewater
+1483, -- Murphy West
+1497, -- Gunther Arcanus
+1503, -- Wretched Zombie
+1511, -- Enraged Silverback Gorilla
+1516, -- Konda
+1642, -- Northshire Guard
+1679, -- Avarus Kharag
+1733, -- Zggi
+1741, -- Deathguard Bartrand
+1756, -- Stormwind Royal Guard
+1777, -- Dakk Blunderblast
+1975, -- Eastvale Lumberjack
+2044, -- Forlorn Spirit
+2045, -- Gunther\'s Minion
+2055, -- Master Apothecary Faranell
+2058, -- Deathstalker Faerleia
+2099, -- Maiden\'s Virtue Crewman
+2105, -- Mountaineer Dokkin
+2112, -- Farrin Daris
+2153, -- Terl Arakor
+2214, -- Deathstalker Lesh
+2238, -- Tog\'thar
+2239, -- Drull
+2316, -- Gol\'dir
+2333, -- Henchman Valik
+2361, -- Tamara Armstrong
+2362, -- Hemmit Armstrong
+2363, -- Apprentice Honeywell
+2378, -- Kundric Zanden
+2379, -- Caretaker Smithers
+2386, -- Southshore Guard
+2392, -- Delia Verana
+2395, -- Vinna Wayne
+2396, -- Hans Zandin
+2400, -- Craig Hewitt
+2402, -- Shara Blazen
+2466, -- Mountaineer Grugelm
+2468, -- Mountaineer Thar
+2469, -- Mountaineer Rharen
+2470, -- Watcher Fraizer
+2506, -- Mountaineer Harn
+2507, -- Mountaineer Uthan
+2508, -- Mountaineer Wuar
+2509, -- Mountaineer Cragg
+2510, -- Mountaineer Ozmok
+2511, -- Mountaineer Bludd
+2512, -- Mountaineer Roghan
+2513, -- Mountaineer Janha
+2514, -- Mountaineer Modax
+2515, -- Mountaineer Fazgard
+2516, -- Mountaineer Kamdar
+2517, -- Mountaineer Langarr
+2518, -- Mountaineer Swarth
+2520, -- Remote-Controlled Golem
+2524, -- Mountaineer Haggis
+2525, -- Mountaineer Barn
+2526, -- Mountaineer Morlic
+2527, -- Mountaineer Angst
+2528, -- Mountaineer Haggil
+2608, -- Commander Amaren
+2616, -- Privateer Groy
+2676, -- Compact Harvest Reaper
+2706, -- Tor\'gan
+2712, -- Quae
+2775, -- Daggerspine Marauder
+2787, -- Zaruk
+2817, -- Rigglefuzz
+2852, -- Enslaved Druid of the Talon
+2860, -- Sigrun Ironhew
+2870, -- [UNUSED] Henria Derth
+2930, -- Sentinel Glynda Nal\'Shea
+2984, -- Seer Wiserunner
+3193, -- Misha Tor\'kren
+3338, -- Sergra Darkthorn
+3341, -- Gann Stonespire
+3388, -- Mahren Skyseer
+3389, -- Regthar Deathgate
+3421, -- Feegly the Exiled
+3431, -- Grenthar
+3448, -- Tonga Runetotem
+3450, -- Defias Companion
+3464, -- Gazrog
+3465, -- Gilthares Firebough
+3501, -- Horde Guard
+3617, -- Lordaeron Citizen
+3659, -- Jorb
+3663, -- Delgren the Purifier
+3691, -- Raene Wolfrunner
+3692, -- Volcor
+3693, -- Terenthis
+3694, -- Sentinel Selarin
+3695, -- Grimclaw
+3702, -- Alanndarian Nightsong
+3844, -- Healing Ward IV
+3846, -- Talen
+3897, -- Krolg
+3916, -- Shael\'dryn
+3939, -- Razormane Wolf
+3981, -- Vorrel Sengutz
+3990, -- Venture Co. Cutter
+3994, -- Keeper Albagorm
+4033, -- Charred Stone Spirit
+4048, -- Falfindel Waywarder
+4080, -- Kaela Shadowspear
+4489, -- Braug Dimspirit
+4510, -- Heralath Fallowbrook
+4535, -- Tamed Battleboar
+4661, -- Gelkis Rumbler
+4787, -- Argent Guard Thaelrid
+4966, -- Private Hendel
+4977, -- Murkshallow Softshell
+4979, -- Theramore Guard
+4983, -- Ogron
+4995, -- Stockade Guard
+5058, -- Wolfguard Worg
+5389, -- Prospector Gunstan
+5414, -- Apothecary Faustin
+5418, -- Deathstalker Zraedus
+5433, -- Tamed Bear
+5440, -- Tamed Crocolisk
+5476, -- Watcher Biggs
+5546, -- Grunt Zuul
+5644, -- Dalinda Malem
+5723, -- Warug\'s Target Dummy
+5780, -- Cloned Ectoplasm
+5781, -- Silithid Creeper Egg
+5899, -- Brine
+6013, -- Wayward Buzzard
+6019, -- Hornizz Brimbuzzle
+6047, -- Aqua Guardian
+6086, -- Auberdine Sentinel
+6087, -- Astranaar Sentinel
+6141, -- Pridewing Soarer
+6244, -- Takar the Seer
+6250, -- Crawler
+6388, -- Zanzil Skeleton
+6667, -- Gelkak Gyromast
+6669, -- The Threshwackonator 4100
+7051, -- Malformed Defias Drone
+7067, -- Venture Co. Drone
+7168, -- Polly
+7233, -- Taskmaster Fizzule
+7287, -- Foreman Silixiz
+7360, -- Dun Garok Soldier
+7395, -- Cockroach
+7489, -- Silverpine Deathguard
+7549, -- Tree Frog
+7607, -- Weegli Blastfuse
+7730, -- Stonetalon Grunt
+7765, -- Rockbiter
+7767, -- Witherbark Felhunter
+7768, -- Witherbark Bloodling
+7865, -- Wildhammer Sentry
+7915, -- Walking Bomb
+7939, -- Feathermoon Sentinel
+7957, -- Jer\'kai Moonweaver
+7975, -- Mulgore Protector
+7980, -- Deathguard Elite
+7999, -- Tyrande Whisperwind
+8015, -- Ashenvale Sentinel
+8016, -- Barrens Guard
+8017, -- Sen\'jin Guardian
+8055, -- Thelsamar Mountaineer
+8096, -- Protector of the People
+8147, -- Camp Mojache Brave
+8154, -- Ghost Walker Brave
+8155, -- Kargath Grunt
+8179, -- Greater Healing Ward
+8310, -- Watcher Wollpert
+8386, -- Horizon Scout Crewman
+8402, -- Enslaved Archaeologist
+8581, -- Blood Elf Defender
+8608, -- Angered Infernal
+8996, -- Voidwalker Minion
+9118, -- Larion
+9119, -- Muigin
+9157, -- Bloodpetal Pest
+9316, -- Wenikee Boltbucket
+9525, -- Freewind Brave
+9598, -- Arei
+9676, -- Tink Sprocketwhistle
+10000, -- Arugal
+10036, -- Brackenwall Enforcer
+10037, -- Lakeshire Guard
+10038, -- Night Watch Guard
+10260, -- Kibler
+10261, -- Burning Felhound
+10262, -- Opus
+10321, -- Emberstrife
+10427, -- Pao\'ka Swiftmountain
+10428, -- Motega Firemane
+10482, -- Risen Lackey
+10619, -- Glacier
+10638, -- Kanati Greycloud
+10684, -- Remorseful Highborne
+10696, -- Refuge Pointe Defender
+10698, -- Summoned Zombie
+10928, -- Succubus Minion
+10940, -- Ghost of the Past
+10941, -- Wizlo Bearingshiner
+10951, -- Marauding Corpse
+10979, -- Scarlet Hound
+11040, -- Watcher Brownell
+11053, -- High Priestess MacDonnell
+11141, -- Spirit of Trey Lightforge
+11145, -- Myolor Sunderfury
+11180, -- Bloodvenom Post Brave
+11195, -- Skeletal Black Warhorse
+11276, -- Azshara Sentinel
+11328, -- Eastvale Peasant
+11347, -- Zealot Lor\'Khan
+11460, -- Alzzin\'s Minion
+11609, -- Alexia Ironknife
+11615, -- Mickey Levine
+11690, -- Gnarlpine Instigator
+11701, -- Mor\'vek
+11713, -- Blackwood Tracker
+11718, -- Sar Browneye
+11748, -- Samantha Swifthoof
+11806, -- Sentinel Onaeya
+11820, -- Locke Okarr
+11856, -- Kaya Flathoof
+11920, -- Goggeroc
+11979, -- Kim Bridenbecker
+11994, -- Rob Bridenbecker
+12160, -- Shadowglen Sentinel
+12657, -- Don Pompa
+12658, -- Adam Lind
+12736, -- Je\'neu Sancrea
+12858, -- Torek
+12859, -- Splintertree Raider
+12862, -- Warsong Scout
+12863, -- Warsong Runner
+12903, -- Splintertree Guard
+13118, -- Crimson Bodyguard
+13159, -- James Clark
+13533, -- Spewed Larva
+13736, -- Noxxious Essence
+13817, -- Voggah Deathgrip
+14370, -- Cadaverous Worm
+14372, -- Winterfall Ambusher
+14385, -- Doomguard Minion
+14872, -- Trok
+14983, -- Field Marshal Oslight
+14987, -- Powerful Healing Ward
+14988, -- Ohgan
+15041, -- Spawn of Mar\'li
+15112, -- Brain Wash Totem
+15117, -- Chained Spirit
+15146, -- Mad Voidwalker
+15288, -- Aluntir
+15290, -- Arakis
+15443, -- Janela Stouthammer
+15449, -- Hive\'Zora Abomination
+15505, -- Canal Frenzy
+15620, -- Hive\'Regal Hunter-Killer
+16135, -- Rayne
+20555, -- Goc
+20918, -- Deathforge Felstalker
+21627);  -- Eclipsion Hawkstrider
+
+UPDATE `creature_template` SET `LootId` = 0 WHERE `entry` IN
+(8257,10717,10461,10536,10441,20117,
+3083, -- Honor Guard
+6021, -- Boar Spirit
+8257, -- Oozeling
+10636, -- Pack Kodo
+10925, -- Rotting Worm
+10943, -- Decrepit Guardian
+11054, -- Crimson Rifleman
+20158, -- Slime-Covered Corpse
+21040, -- Outraged Raven\'s Wood Sapling
+128, -- Angry Programmer Tweedle Dee
+197, -- Marshal McBride
+235, -- Salma Saldean
+240, -- Marshal Dughan
+246, -- \"Auntie\" Bernice Stonefield
+255, -- Gerard Tiller
+266, -- Wiley the Black
+275, -- Whit Wantmal
+288, -- Jitters
+313, -- Theocritus
+325, -- Hogan Ference
+341, -- Foreman Oslow
+358, -- Riding Wolf (Brown)
+359, -- Riding Wolf (Winter)
+379, -- Darcy
+381, -- Dockmaster Baren
+382, -- Marshal Marris
+415, -- Verner Osgood
+416, -- Imp
+417, -- Felhunter
+466, -- General Marcus Jonathan
+467, -- The Defias Traitor
+468, -- Town Crier
+469, -- Lieutenant Doren
+487, -- Protector Bialon
+488, -- Protector Weaver
+489, -- Protector Dutfield
+490, -- Protector Gariel
+494, -- Watcher Bukouris
+495, -- Watcher Keefer
+499, -- Watcher Paige
+659, -- El Pollo Grande
+698, -- Bloodscalp Tiger
+754, -- Rebel Watchman
+756, -- Skullsplitter Panther
+826, -- Watcher Jan
+827, -- Watcher Mocarski
+828, -- Watcher Petras
+853, -- Coldridge Mountaineer
+866, -- Stonard Grunt
+867, -- Stonard Cartographer
+869, -- Protector Dorana
+870, -- Protector Deni
+874, -- Protector Korelor
+876, -- Protector Leick
+885, -- Watcher Keller
+886, -- Watcher Hartin
+887, -- Watcher Jordan
+888, -- Watcher Dodds
+932, -- Guard Ashlock
+933, -- Guard Hiett
+934, -- Guard Clarke
+935, -- Guard Pearce
+936, -- Guard Adams
+999, -- Watcher Royce
+1001, -- Watcher Hutchins
+1064, -- Grom\'gol Grunt
+1066, -- Mottled Riptooth
+1071, -- Longbraid the Grim
+1073, -- Ashlan Stonesmirk
+1093, -- Chief Engineer Hinderweir VII
+1099, -- Watcher Gelwin
+1244, -- Rethiel the Greenwarden
+1245, -- Kogan Forgestone
+1276, -- Mountaineer Brokk
+1277, -- Mountaineer Ganin
+1278, -- Mountaineer Stenn
+1279, -- Mountaineer Flint
+1280, -- Mountaineer Droken
+1281, -- Mountaineer Zaren
+1282, -- Mountaineer Veek
+1283, -- Mountaineer Kalmir
+1327, -- Reese Langston
+1329, -- Mountaineer Naarh
+1330, -- Mountaineer Tyraw
+1331, -- Mountaineer Luxst
+1332, -- Mountaineer Morran
+1334, -- Mountaineer Hammerfall
+1335, -- Mountaineer Yuttha
+1336, -- Mountaineer Zwarn
+1337, -- Mountaineer Gwarth
+1338, -- Mountaineer Dalk
+1374, -- Rejold Barleybrew
+1414, -- Lisan Pierce
+1434, -- Menethil Sentry
+1436, -- Watcher Cutford
+1437, -- Thomas Booker
+1476, -- Hargin Mundar
+1477, -- Christoph Faral
+1481, -- Bart Tidewater
+1483, -- Murphy West
+1497, -- Gunther Arcanus
+1503, -- Wretched Zombie
+1511, -- Enraged Silverback Gorilla
+1516, -- Konda
+1642, -- Northshire Guard
+1679, -- Avarus Kharag
+1733, -- Zggi
+1741, -- Deathguard Bartrand
+1756, -- Stormwind Royal Guard
+1777, -- Dakk Blunderblast
+1975, -- Eastvale Lumberjack
+2044, -- Forlorn Spirit
+2045, -- Gunther\'s Minion
+2055, -- Master Apothecary Faranell
+2058, -- Deathstalker Faerleia
+2099, -- Maiden\'s Virtue Crewman
+2105, -- Mountaineer Dokkin
+2112, -- Farrin Daris
+2153, -- Terl Arakor
+2214, -- Deathstalker Lesh
+2238, -- Tog\'thar
+2239, -- Drull
+2316, -- Gol\'dir
+2333, -- Henchman Valik
+2361, -- Tamara Armstrong
+2362, -- Hemmit Armstrong
+2363, -- Apprentice Honeywell
+2378, -- Kundric Zanden
+2379, -- Caretaker Smithers
+2386, -- Southshore Guard
+2392, -- Delia Verana
+2395, -- Vinna Wayne
+2396, -- Hans Zandin
+2400, -- Craig Hewitt
+2402, -- Shara Blazen
+2466, -- Mountaineer Grugelm
+2468, -- Mountaineer Thar
+2469, -- Mountaineer Rharen
+2470, -- Watcher Fraizer
+2506, -- Mountaineer Harn
+2507, -- Mountaineer Uthan
+2508, -- Mountaineer Wuar
+2509, -- Mountaineer Cragg
+2510, -- Mountaineer Ozmok
+2511, -- Mountaineer Bludd
+2512, -- Mountaineer Roghan
+2513, -- Mountaineer Janha
+2514, -- Mountaineer Modax
+2515, -- Mountaineer Fazgard
+2516, -- Mountaineer Kamdar
+2517, -- Mountaineer Langarr
+2518, -- Mountaineer Swarth
+2520, -- Remote-Controlled Golem
+2524, -- Mountaineer Haggis
+2525, -- Mountaineer Barn
+2526, -- Mountaineer Morlic
+2527, -- Mountaineer Angst
+2528, -- Mountaineer Haggil
+2608, -- Commander Amaren
+2616, -- Privateer Groy
+2676, -- Compact Harvest Reaper
+2706, -- Tor\'gan
+2712, -- Quae
+2775, -- Daggerspine Marauder
+2787, -- Zaruk
+2817, -- Rigglefuzz
+2852, -- Enslaved Druid of the Talon
+2860, -- Sigrun Ironhew
+2870, -- [UNUSED] Henria Derth
+2930, -- Sentinel Glynda Nal\'Shea
+2984, -- Seer Wiserunner
+3193, -- Misha Tor\'kren
+3338, -- Sergra Darkthorn
+3341, -- Gann Stonespire
+3388, -- Mahren Skyseer
+3389, -- Regthar Deathgate
+3421, -- Feegly the Exiled
+3431, -- Grenthar
+3448, -- Tonga Runetotem
+3450, -- Defias Companion
+3464, -- Gazrog
+3465, -- Gilthares Firebough
+3501, -- Horde Guard
+3617, -- Lordaeron Citizen
+3659, -- Jorb
+3663, -- Delgren the Purifier
+3691, -- Raene Wolfrunner
+3692, -- Volcor
+3693, -- Terenthis
+3694, -- Sentinel Selarin
+3695, -- Grimclaw
+3702, -- Alanndarian Nightsong
+3844, -- Healing Ward IV
+3846, -- Talen
+3897, -- Krolg
+3916, -- Shael\'dryn
+3939, -- Razormane Wolf
+3981, -- Vorrel Sengutz
+3990, -- Venture Co. Cutter
+3994, -- Keeper Albagorm
+4033, -- Charred Stone Spirit
+4048, -- Falfindel Waywarder
+4080, -- Kaela Shadowspear
+4489, -- Braug Dimspirit
+4510, -- Heralath Fallowbrook
+4535, -- Tamed Battleboar
+4661, -- Gelkis Rumbler
+4787, -- Argent Guard Thaelrid
+4966, -- Private Hendel
+4977, -- Murkshallow Softshell
+4979, -- Theramore Guard
+4983, -- Ogron
+4995, -- Stockade Guard
+5058, -- Wolfguard Worg
+5389, -- Prospector Gunstan
+5414, -- Apothecary Faustin
+5418, -- Deathstalker Zraedus
+5433, -- Tamed Bear
+5440, -- Tamed Crocolisk
+5476, -- Watcher Biggs
+5546, -- Grunt Zuul
+5644, -- Dalinda Malem
+5723, -- Warug\'s Target Dummy
+5780, -- Cloned Ectoplasm
+5781, -- Silithid Creeper Egg
+5899, -- Brine
+6013, -- Wayward Buzzard
+6019, -- Hornizz Brimbuzzle
+6047, -- Aqua Guardian
+6086, -- Auberdine Sentinel
+6087, -- Astranaar Sentinel
+6141, -- Pridewing Soarer
+6244, -- Takar the Seer
+6250, -- Crawler
+6388, -- Zanzil Skeleton
+6667, -- Gelkak Gyromast
+6669, -- The Threshwackonator 4100
+7051, -- Malformed Defias Drone
+7067, -- Venture Co. Drone
+7168, -- Polly
+7233, -- Taskmaster Fizzule
+7287, -- Foreman Silixiz
+7360, -- Dun Garok Soldier
+7395, -- Cockroach
+7489, -- Silverpine Deathguard
+7549, -- Tree Frog
+7607, -- Weegli Blastfuse
+7730, -- Stonetalon Grunt
+7765, -- Rockbiter
+7767, -- Witherbark Felhunter
+7768, -- Witherbark Bloodling
+7865, -- Wildhammer Sentry
+7915, -- Walking Bomb
+7939, -- Feathermoon Sentinel
+7957, -- Jer\'kai Moonweaver
+7975, -- Mulgore Protector
+7980, -- Deathguard Elite
+7999, -- Tyrande Whisperwind
+8015, -- Ashenvale Sentinel
+8016, -- Barrens Guard
+8017, -- Sen\'jin Guardian
+8055, -- Thelsamar Mountaineer
+8096, -- Protector of the People
+8147, -- Camp Mojache Brave
+8154, -- Ghost Walker Brave
+8155, -- Kargath Grunt
+8179, -- Greater Healing Ward
+8310, -- Watcher Wollpert
+8386, -- Horizon Scout Crewman
+8402, -- Enslaved Archaeologist
+8581, -- Blood Elf Defender
+8608, -- Angered Infernal
+8996, -- Voidwalker Minion
+9118, -- Larion
+9119, -- Muigin
+9157, -- Bloodpetal Pest
+9316, -- Wenikee Boltbucket
+9525, -- Freewind Brave
+9598, -- Arei
+9676, -- Tink Sprocketwhistle
+10000, -- Arugal
+10036, -- Brackenwall Enforcer
+10037, -- Lakeshire Guard
+10038, -- Night Watch Guard
+10260, -- Kibler
+10261, -- Burning Felhound
+10262, -- Opus
+10321, -- Emberstrife
+10427, -- Pao\'ka Swiftmountain
+10428, -- Motega Firemane
+10482, -- Risen Lackey
+10619, -- Glacier
+10638, -- Kanati Greycloud
+10684, -- Remorseful Highborne
+10696, -- Refuge Pointe Defender
+10698, -- Summoned Zombie
+10928, -- Succubus Minion
+10940, -- Ghost of the Past
+10941, -- Wizlo Bearingshiner
+10951, -- Marauding Corpse
+10979, -- Scarlet Hound
+11040, -- Watcher Brownell
+11053, -- High Priestess MacDonnell
+11141, -- Spirit of Trey Lightforge
+11145, -- Myolor Sunderfury
+11180, -- Bloodvenom Post Brave
+11195, -- Skeletal Black Warhorse
+11276, -- Azshara Sentinel
+11328, -- Eastvale Peasant
+11347, -- Zealot Lor\'Khan
+11460, -- Alzzin\'s Minion
+11609, -- Alexia Ironknife
+11615, -- Mickey Levine
+11690, -- Gnarlpine Instigator
+11701, -- Mor\'vek
+11713, -- Blackwood Tracker
+11718, -- Sar Browneye
+11748, -- Samantha Swifthoof
+11806, -- Sentinel Onaeya
+11820, -- Locke Okarr
+11856, -- Kaya Flathoof
+11920, -- Goggeroc
+11979, -- Kim Bridenbecker
+11994, -- Rob Bridenbecker
+12160, -- Shadowglen Sentinel
+12657, -- Don Pompa
+12658, -- Adam Lind
+12736, -- Je\'neu Sancrea
+12858, -- Torek
+12859, -- Splintertree Raider
+12862, -- Warsong Scout
+12863, -- Warsong Runner
+12903, -- Splintertree Guard
+13118, -- Crimson Bodyguard
+13159, -- James Clark
+13533, -- Spewed Larva
+13736, -- Noxxious Essence
+13817, -- Voggah Deathgrip
+14370, -- Cadaverous Worm
+14372, -- Winterfall Ambusher
+14385, -- Doomguard Minion
+14872, -- Trok
+14983, -- Field Marshal Oslight
+14987, -- Powerful Healing Ward
+14988, -- Ohgan
+15041, -- Spawn of Mar\'li
+15112, -- Brain Wash Totem
+15117, -- Chained Spirit
+15146, -- Mad Voidwalker
+15288, -- Aluntir
+15290, -- Arakis
+15443, -- Janela Stouthammer
+15449, -- Hive\'Zora Abomination
+15505, -- Canal Frenzy
+15620, -- Hive\'Regal Hunter-Killer
+16135, -- Rayne
+20555, -- Goc
+20918, -- Deathforge Felstalker
+21627);  -- Eclipsion Hawkstrider
+
+-- Bonestripper Buzzard (16972) - Should Be Properly Flying
+UPDATE `creature_template` SET `InhabitType` = 4 WHERE `entry` IN (16972);
+
+-- Prevent Cannon NPC From Moving
+-- Fel Cannon SAI
+SET @ENTRY := 19399;
+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,25,0,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Fel Cannon - On Reset - Enable Combat Movement");
+
+-- Legion Fel Cannon MKII SAI
+SET @ENTRY := 22451;
+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,11,0,100,1,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Legion Fel Cannon MKII - On Respawn - Disable Combat Movement (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,0,1000,500,5000,11,36238,1,0,0,0,0,2,0,0,0,0,0,0,0,"Legion Fel Cannon MKII - In Combat - Cast 'Fel Cannon Blast'");
+
+-- Remove wrong spawned Buzzard
+/*
+DELETE FROM `creature` WHERE `guid` = 6998;
+*/
+-- Update Position for one Buzzard
+/*
+UPDATE `creature` SET `position_x` = -6662.029785, `position_y` = -3660.025391, `position_z` = 255.250671, `orientation` = 6.218313 WHERE `guid` = 7607;
+*/
+-- Remove Non-Existant Loot - Weird Loot Drop
+DELETE FROM `creature_loot_template` WHERE `entry` IN (255);
+UPDATE `creature_template` SET `LootId` = 0 WHERE `LootId` IN (255);
+
+-- Fix Plans: Ragesteel Shoulders To Drop More Blizzlike - (Current Rates are wowhead and these only drop for Blacksmith Players)
+UPDATE `creature_loot_template` SET `Chance` = 1 WHERE `item` = 33174 AND `entry` IN (21050,21061);
+UPDATE `creature_loot_template` SET `Chance` = 0.5 WHERE `item` = 33174 AND `entry` IN (21059,21060);
+-- Fix Plans: Ragesteel Helm To Drop More Blizzlike - (Current Rates are wowhead and these only drop for Blacksmith Players)
+UPDATE `creature_loot_template` SET `Chance` = 4 WHERE `item` = 23612 AND `entry` IN (16952);
+UPDATE `creature_loot_template` SET `Chance` = 1 WHERE `item` = 23612 AND `entry` IN (21060,21061);
+-- Fix Plans: Ragesteel Breastplate To Drop More Blizzlike - (Current Rates are wowhead and these only drop for Blacksmith Players)
+UPDATE `creature_loot_template` SET `Chance` = 4 WHERE `item` = 23613 AND `entry` IN (21454);
+UPDATE `creature_loot_template` SET `Chance` = 1 WHERE `item` = 23613 AND `entry` IN (23324,23305);
+
+-- Fix Movement Speed of Ranging Flames in Mechanar - 4.3.4 Sniff Data
+UPDATE `creature_template` SET `Speed_Walk` = 1 WHERE `entry` = 20481;
+UPDATE `creature_template` SET `Speed_Walk` = 1 WHERE `entry` = 21538;
+
+-- Remove Troll-Hide Bag Drops From NPC Not Level 40-52 Range
+DELETE FROM `creature_loot_template` WHERE `item` = 1685 AND `entry` IN (2852,2850,7011,9445,10981,4853,7321,7320,7030,7397,4860,7396);
+
+-- Fix Hoard of the Black Dragonflight - Should Always Drop Black Dragonflight Molt
+UPDATE `item_loot_template` SET `Chance`=100 WHERE  `Entry`=10569 AND `Item`=10575;
+
+-- Remove Boss Plans Drops From Normal NPC Loot
+DELETE FROM `creature_loot_template` WHERE `item` IN (22388,22389,22390);
+
+-- Oronok Torn-heart SAI - Add 'Chain Lightning'
+SET @ENTRY := 21183;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=2;
+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,2,0,0,0,100,0,6700,11200,18100,24900,11,16006,64,0,0,0,0,2,0,0,0,0,0,0,0,"Oronok Torn-heart - In Combat - Cast 'Chain Lightning'");
+
+-- DELETE Miniscule Diamond Ring FROM CHEST LOOT (VENDOR ITEM ONLY)
+DELETE FROM `gameobject_loot_template` WHERE `item` IN (7339);
+
+-- All Mechanical NPC Are Immune To Bleed Effects  
+-- UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|16384 WHERE `type` = 9;
+
+-- DB/Creature: Anathemus - Movement
+/*
+SET @NPC := 27567;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -7095.56, -2718.91, 241.823),
+(@PATH, 2, -7067.39, -2756.06, 242.343),
+(@PATH, 3, -7037.44, -2790.59, 241.668),
+(@PATH, 4, -7018.55, -2835.34, 244.453),
+(@PATH, 5, -6984.54, -2869.52, 243.404),
+(@PATH, 6, -6938.39, -2890.16, 241.667),
+(@PATH, 7, -6905.93, -2928.64, 245.614),
+(@PATH, 8, -6854.77, -2984.54, 244.127),
+(@PATH, 9, -6836.56, -3004.44, 242.001),
+(@PATH, 10, -6807.97, -3077.38, 241.258),
+(@PATH, 11, -6787.47, -3129.66, 240.549),
+(@PATH, 12, -6764.01, -3175.88, 240.743),
+(@PATH, 13, -6745.73, -3211.91, 240.743),
+(@PATH, 14, -6708.56, -3249.22, 240.743),
+(@PATH, 15, -6693.82, -3306.64, 240.985),
+(@PATH, 16, -6720.17, -3363.87, 241.645),
+(@PATH, 17, -6774.04, -3394.9, 241.667),
+(@PATH, 18, -6846.93, -3401.71, 241.762),
+(@PATH, 19, -6905.98, -3407.23, 243.235),
+(@PATH, 20, -6961.35, -3397.87, 241.796),
+(@PATH, 21, -6999.34, -3391.44, 241.667),
+(@PATH, 22, -7039.67, -3397.01, 243.935),
+(@PATH, 23, -7064.13, -3400.84, 245.275),
+(@PATH, 24, -7110.78, -3375.07, 242.97),
+(@PATH, 25, -7113.36, -3322.06, 242.365),
+(@PATH, 26, -7098.28, -3284.59, 242.883),
+(@PATH, 27, -7095.63, -3246.03, 242.983),
+(@PATH, 28, -7085.7, -3202.78, 241.97),
+(@PATH, 29, -7072.35, -3144.63, 241.67),
+(@PATH, 30, -7061.88, -3098.99, 242.684),
+(@PATH, 31, -7015.89, -3040.38, 242.25),
+(@PATH, 32, -6970.5, -2981.02, 241.666),
+(@PATH, 33, -6934.33, -2905.91, 241.816),
+(@PATH, 34, -6913.11, -2861.83, 241.894),
+(@PATH, 35, -6874.86, -2825.65, 241.667),
+(@PATH, 36, -6859.87, -2776.27, 241.975),
+(@PATH, 37, -6842.13, -2717.85, 241.729),
+(@PATH, 38, -6846.45, -2667.72, 241.51),
+(@PATH, 39, -6851.46, -2607.44, 240.745),
+(@PATH, 40, -6852.08, -2566.73, 240.743),
+(@PATH, 41, -6880.82, -2550.47, 240.743),
+(@PATH, 42, -6920.74, -2512.13, 240.743),
+(@PATH, 43, -6957.01, -2459.73, 240.743),
+(@PATH, 44, -6968.86, -2436.17, 240.743),
+(@PATH, 45, -6985.18, -2427.13, 242.407),
+(@PATH, 46, -7032.28, -2403.95, 240.308),
+(@PATH, 47, -7070.29, -2406.17, 243.718),
+(@PATH, 48, -7132.2, -2394.94, 241.667),
+(@PATH, 49, -7165.06, -2398.26, 240.663),
+(@PATH, 50, -7188.31, -2426.48, 242.147),
+(@PATH, 51, -7194.06, -2475.31, 245.94),
+(@PATH, 52, -7197.13, -2523.31, 248.631),
+(@PATH, 53, -7185.88, -2555.67, 245.846),
+(@PATH, 54, -7191.35, -2594.02, 246.023),
+(@PATH, 55, -7175.23, -2639.84, 244.411),
+(@PATH, 56, -7164.76, -2655.17, 243.481),
+(@PATH, 57, -7143.76, -2663.97, 241.977),
+(@PATH, 58, -7120.74, -2667.13, 241.845);
+*/
+
+-- Somnus Rare NPC Movement 
+/*
+UPDATE `creature` SET `position_x` = -10666, `position_y` = -3923, `position_z` = 18.438, `orientation` = 6.218313 WHERE `guid` = 42880;
+SET @NPC := 42880;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH,1,-10666,-3923,18.438),
+(@PATH,2,-10674.5,-3909.81,17.3732),
+(@PATH,3,-10703.7,-3916.17,17.3732),
+(@PATH,4,-10770,-4007.98,17.9099),
+(@PATH,5,-10722.1,-4038.75,17.6482),
+(@PATH,6,-10654.9,-4061.03,17.3742),
+(@PATH,7,-10591.6,-4027.09,17.3742),
+(@PATH,8,-10568.6,-4002.12,17.3853),
+(@PATH,9,-10575.8,-3978.89,17.4333),
+(@PATH,10,-10624.2,-3924.85,17.5842);
+*/
+
+-- Rok'Alim the Pounder -- Pathing
+/*
+SET @NPC := 21591;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,4097,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, -5204.92, -1565.98, -48.1972),
+(@PATH, 2, -5214.62, -1555.88, -49.2243),
+(@PATH, 3, -5230.7, -1546.65, -49.3283),
+(@PATH, 4, -5241.37, -1540.68, -50.6353),
+(@PATH, 5, -5257.24, -1534.29, -51.2466),
+(@PATH, 6, -5269.84, -1529.99, -52.025),
+(@PATH, 7, -5282.4, -1525.82, -53.1763),
+(@PATH, 8, -5288.3, -1522.98, -56.4051),
+(@PATH, 9, -5286.83, -1503.93, -56.481),
+(@PATH, 10, -5270.15, -1482.05, -56.3993),
+(@PATH, 11, -5254.26, -1461.2, -56.0616),
+(@PATH, 12, -5241.19, -1442.79, -55.4567),
+(@PATH, 13, -5221.53, -1416.03, -53.8072),
+(@PATH, 14, -5198.85, -1395.52, -52.7577),
+(@PATH, 15, -5181.67, -1374.63, -51.8565),
+(@PATH, 16, -5169.68, -1349.39, -50.6463),
+(@PATH, 17, -5154.09, -1328.35, -49.6798),
+(@PATH, 18, -5133.36, -1309.61, -49.4684),
+(@PATH, 19, -5128.83, -1305.52, -49.5074),
+(@PATH, 20, -5116.85, -1280.28, -49.9129),
+(@PATH, 21, -5102.61, -1250.27, -49.9234),
+(@PATH, 22, -5092.12, -1228.17, -52.6244),
+(@PATH, 23, -5069.58, -1197.09, -55.3233),
+(@PATH, 24, -5062.96, -1184.76, -56.1412),
+(@PATH, 25, -5039.98, -1165.97, -56.9965),
+(@PATH, 26, -5016.58, -1158.92, -55.1305),
+(@PATH, 27, -5006.19, -1139.71, -52.2228),
+(@PATH, 28, -4991.9, -1125.57, -50.647),
+(@PATH, 29, -4960.86, -1102.84, -52.0625),
+(@PATH, 30, -4946.76, -1092.52, -52.4456),
+(@PATH, 31, -4928.1, -1087.96, -53.0811),
+(@PATH, 32, -4911.55, -1088.84, -54.6845),
+(@PATH, 33, -4892.69, -1085.17, -58.7394),
+(@PATH, 34, -4862.62, -1069.22, -58.5493),
+(@PATH, 35, -4841.79, -1058.18, -58.3265),
+(@PATH, 36, -4832.77, -1054.99, -58.5381),
+(@PATH, 37, -4810.17, -1040.02, -58.7495),
+(@PATH, 38, -4781.03, -1020.73, -58.7479),
+(@PATH, 39, -4763.55, -1010.94, -58.3438),
+(@PATH, 40, -4745.84, -1003.38, -58.7489),
+(@PATH, 41, -4731.81, -989.059, -56.4676),
+(@PATH, 42, -4718.22, -969.831, -52.847),
+(@PATH, 43, -4702.23, -952.577, -50.7703),
+(@PATH, 44, -4687.36, -943.465, -49.807),
+(@PATH, 45, -4676.14, -938.654, -49.1061),
+(@PATH, 46, -4664.32, -929.672, -50.7595),
+(@PATH, 47, -4638.64, -916.618, -56.6334),
+(@PATH, 48, -4625.96, -902.198, -54.0504),
+(@PATH, 49, -4617.08, -882.245, -51.521),
+(@PATH, 50, -4597.35, -850.377, -53.6356),
+(@PATH, 51, -4579.89, -855.902, -52.0292),
+(@PATH, 52, -4589.98, -867.978, -52.0226),
+(@PATH, 53, -4601.74, -889.439, -50.6814),
+(@PATH, 54, -4605.17, -901.682, -52.4203),
+(@PATH, 55, -4610.44, -918.339, -57.6121),
+(@PATH, 56, -4606.58, -931.714, -56.7672),
+(@PATH, 57, -4596.94, -945.123, -52.9157),
+(@PATH, 58, -4581.9, -955.52, -50.9032),
+(@PATH, 59, -4572.11, -966.669, -49.0426),
+(@PATH, 60, -4560.31, -987.143, -54.2615),
+(@PATH, 61, -4541.68, -1003.01, -54.449),
+(@PATH, 62, -4552.6, -1011.68, -55.3938),
+(@PATH, 63, -4553.95, -1015.83, -55.5415),
+(@PATH, 64, -4551.73, -1033.16, -56.3598),
+(@PATH, 65, -4554.74, -1051.2, -55.7008),
+(@PATH, 66, -4576.43, -1062.38, -52.3882),
+(@PATH, 67, -4595.78, -1072.35, -47.8427),
+(@PATH, 68, -4614.09, -1084.25, -50.2251),
+(@PATH, 69, -4635.17, -1096.57, -53.1295),
+(@PATH, 70, -4655.15, -1116.11, -54.7833),
+(@PATH, 71, -4670.11, -1111.43, -52.6073),
+(@PATH, 72, -4696.82, -1098.49, -52.938),
+(@PATH, 73, -4708.96, -1097.21, -54.7856),
+(@PATH, 74, -4727.26, -1112.01, -50.8514),
+(@PATH, 75, -4730.2, -1135.72, -42.7862),
+(@PATH, 76, -4734.1, -1146.39, -39.9821),
+(@PATH, 77, -4742.57, -1153.98, -39.8057),
+(@PATH, 78, -4748.47, -1163.7, -41.1494),
+(@PATH, 79, -4753.23, -1182.36, -46.3681),
+(@PATH, 80, -4754.96, -1211.99, -53.963),
+(@PATH, 81, -4745.96, -1249.27, -54.0574),
+(@PATH, 82, -4746.93, -1265.88, -52.9851),
+(@PATH, 83, -4754.48, -1290.02, -48.5838),
+(@PATH, 84, -4764.33, -1304.45, -48.6753),
+(@PATH, 85, -4769.15, -1327.53, -49.0466),
+(@PATH, 86, -4775, -1341.23, -53.1682),
+(@PATH, 87, -4778.21, -1369.85, -53.8389),
+(@PATH, 88, -4786.3, -1377.76, -53.4634),
+(@PATH, 89, -4804.32, -1371.1, -54.4526),
+(@PATH, 90, -4830.07, -1375.97, -53.9953),
+(@PATH, 91, -4863.88, -1412.53, -52.4747),
+(@PATH, 92, -4876.27, -1423.62, -50.5087),
+(@PATH, 93, -4883.91, -1453.15, -50.5943),
+(@PATH, 94, -4875.09, -1489.66, -47.697),
+(@PATH, 95, -4868.9, -1500.25, -47.3607),
+(@PATH, 96, -4864.04, -1520.62, -47.5608),
+(@PATH, 97, -4840.64, -1540.3, -47.1878),
+(@PATH, 98, -4813.21, -1563.37, -49.0607),
+(@PATH, 99, -4798.37, -1586.05, -51.2704),
+(@PATH, 100, -4797.3, -1611.32, -49.8867),
+(@PATH, 101, -4802.75, -1637.81, -49.9839),
+(@PATH, 102, -4811.28, -1665.36, -50.9323),
+(@PATH, 103, -4829.82, -1672.43, -47.6692),
+(@PATH, 104, -4850.17, -1677.41, -38.4677),
+(@PATH, 105, -4868.01, -1681.78, -33.1823),
+(@PATH, 106, -4885.85, -1686.15, -35.8888),
+(@PATH, 107, -4907.88, -1691.54, -45.483),
+(@PATH, 108, -4922.81, -1704.92, -53.1108),
+(@PATH, 109, -4937.51, -1726.61, -57.509),
+(@PATH, 110, -4969.21, -1749.86, -60.1434),
+(@PATH, 111, -4994.72, -1763.31, -64.3609),
+(@PATH, 112, -5028.79, -1764.86, -65.5336),
+(@PATH, 113, -5065.95, -1759.59, -66.5919),
+(@PATH, 114, -5093.52, -1770.39, -62.2996),
+(@PATH, 115, -5105.65, -1775.34, -61.0208),
+(@PATH, 116, -5123.93, -1792.82, -57.2378),
+(@PATH, 117, -5149.56, -1806.05, -57.8151),
+(@PATH, 118, -5173.42, -1831.56, -58.1518),
+(@PATH, 119, -5186.01, -1870.63, -57.7254),
+(@PATH, 120, -5197.27, -1905.54, -57.034),
+(@PATH, 121, -5211.94, -1929.84, -62.5757),
+(@PATH, 122, -5217.61, -1963.41, -63.2077),
+(@PATH, 123, -5213.49, -1995.46, -61.1058),
+(@PATH, 124, -5224.94, -2025.67, -60.3056),
+(@PATH, 125, -5267.7, -2047.58, -61.7613),
+(@PATH, 126, -5298.28, -2054.79, -60.6321),
+(@PATH, 127, -5335.13, -2041.09, -61.2567),
+(@PATH, 128, -5370.89, -2042.4, -62.2819),
+(@PATH, 129, -5404.02, -2043.62, -63.9917),
+(@PATH, 130, -5427.96, -2038.56, -64.7203),
+(@PATH, 131, -5443.81, -2022.38, -63.5722),
+(@PATH, 132, -5460.12, -1994.54, -58.3875),
+(@PATH, 133, -5478.17, -1979.38, -58.9688),
+(@PATH, 134, -5501.73, -1950.11, -60.4141),
+(@PATH, 135, -5524.73, -1937.53, -59.9879),
+(@PATH, 136, -5533.82, -1917.68, -59.0687),
+(@PATH, 137, -5530.9, -1890.73, -58.5037),
+(@PATH, 138, -5520.29, -1865.83, -57.9582),
+(@PATH, 139, -5516.68, -1848.78, -57.2414),
+(@PATH, 140, -5506.58, -1830.44, -56.6996),
+(@PATH, 141, -5491.7, -1830.59, -56.4063),
+(@PATH, 142, -5470.03, -1839.83, -54.3328),
+(@PATH, 143, -5457.09, -1829.48, -50.7656),
+(@PATH, 144, -5463.51, -1817.04, -48.0715),
+(@PATH, 145, -5481.32, -1806.02, -49.6301),
+(@PATH, 146, -5483.3, -1791.35, -45.245),
+(@PATH, 147, -5480.45, -1769.64, -33.9141),
+(@PATH, 148, -5475.24, -1759.54, -25.6579),
+(@PATH, 149, -5471.3, -1747.98, -19.724),
+(@PATH, 150, -5469.04, -1741.36, -17.7276),
+(@PATH, 151, -5465.97, -1728.89, -21.8808),
+(@PATH, 152, -5452.89, -1712.47, -31.4806),
+(@PATH, 153, -5438.73, -1694.68, -39.2293),
+(@PATH, 154, -5415, -1665.24, -52.9235),
+(@PATH, 155, -5404.21, -1650.38, -54.0433),
+(@PATH, 156, -5382.14, -1619.96, -55.4564),
+(@PATH, 157, -5359.21, -1581.86, -54.3701),
+(@PATH, 158, -5335.16, -1551.91, -54.5505),
+(@PATH, 159, -5307.35, -1526.65, -56.18),
+(@PATH, 160, -5277.19, -1490.33, -56.4778),
+(@PATH, 161, -5254.46, -1467.41, -56.1179),
+(@PATH, 162, -5234.6, -1435.62, -54.6556),
+(@PATH, 163, -5208.81, -1408.3, -52.7023),
+(@PATH, 164, -5186.86, -1376.82, -52.0997),
+(@PATH, 165, -5161.9, -1341.03, -50.2505),
+(@PATH, 166, -5111.66, -1355.74, -50.9843),
+(@PATH, 167, -5094.4, -1380.98, -51.8489),
+(@PATH, 168, -5073.89, -1397.17, -52.37),
+(@PATH, 169, -5064.51, -1427.11, -52.3102),
+(@PATH, 170, -5052.49, -1465.43, -50.1334),
+(@PATH, 171, -5033.77, -1492.85, -49.7627),
+(@PATH, 172, -5044.56, -1524.25, -48.7018),
+(@PATH, 173, -5066.05, -1540.68, -48.0147),
+(@PATH, 174, -5084.74, -1554.96, -47.1104),
+(@PATH, 175, -5105.14, -1565.01, -46.4026),
+(@PATH, 176, -5129.66, -1571.52, -49.5441),
+(@PATH, 177, -5154.97, -1578.25, -54.2102),
+(@PATH, 178, -5181.09, -1576.09, -53.6363);
+*/
+
+-- RFK fixes and improvements
+-- Update NPC For Proper Type and Add Waypoint Movement
+UPDATE `creature` SET `id` = 4436, `SpawnDist` = 0, `MovementType` = 2 WHERE `guid` = 87296;
+SET @NPC := 87296;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH,1,1984.9,1601.33,79.6094, 0),
+(@PATH,2,1976.46,1601.48,80.0231,0),
+(@PATH,3,1967.94,1601.07,80.4888,0),
+(@PATH,4,1961.14,1599.4,81.1372, 0),
+(@PATH,5,1955.46,1595.81,81.9168,0),
+(@PATH,6,1951.26,1583.76,81.8884,0),
+(@PATH,7,1955.19,1594.79,82.0734,0),
+(@PATH,8,1963.58,1599.38,80.8979,0),
+(@PATH,9,1968.28,1601.08,80.4596,0),
+(@PATH,10,1986.78,1601.08,79.783,0);
+
+-- Move NPC into Proper Position
+UPDATE `creature` SET `position_x` = 2008.055786, `position_y` = 1569.062988, `position_z` = 81.737740, `orientation` = 2.060939 WHERE `guid` = 87292;
+
+-- NPC NPC Into Position and Change to Correct Type
+UPDATE `creature` SET `id` = 4530, `spawndist` = 0, `MovementType` = 0, `position_x` = 2000.325195, `position_y` = 1558.828735, `position_z` = 82.008972, `orientation` = 0.571824 WHERE `guid` = 87293;
+
+-- Fix Hogger Movement (Random)
+/*
+UPDATE `creature` SET `spawndist`=8, `MovementType`=1 WHERE  `guid`=80531;
+*/
+
+-- Fix Gnomeregan Teleport XYZ -- Correct XYZ to better location and not off the ground
+/*
+UPDATE `areatrigger_teleport` SET `target_position_x` = -327.5286, `target_position_y` = -4.6991, `target_position_z` = -152.84598, `target_orientation` = 3.02761 WHERE `id` = 324;
+*/
+
+-- NOTE! be carefull with this unitflags 32768. Implement NPC Swimming Proper Animations
+UPDATE `creature_template` SET `Unit_Flags`=`Unit_Flags`|32768 WHERE `InhabitType` IN (2);
diff --git a/sql/updates/world/master/2018_03_17_61_world_2017_01_03_01_world.sql b/sql/updates/world/master/2018_03_17_61_world_2017_01_03_01_world.sql
new file mode 100644
index 000000000..51c907c1d
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_61_world_2017_01_03_01_world.sql
@@ -0,0 +1,1862 @@
+-- ========================================
+-- Caverns of Time: Old Hillsbrad Foothills
+-- ========================================
+
+-- ========================================================
+-- All Bosses and Heroic Bosses Are Immune To Crowd Control -- Daze, Horror, Shackle, Banish, Polymorph, Knockout, Freeze, Stun, Snare, Sleep, Silence, Pacify, Root, Fear, Distract, Disarm, Confused, Charm
+-- ========================================================
+UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|16384 WHERE `entry` IN (17848,20535,17862,20521,18096,20531);
+-- =========================================
+-- REMOVE NPC SPAWNS (WILL REUSE GUID)
+-- =========================================
+-- Removed Spawns - Reuse GUID
+DELETE FROM `creature` WHERE `guid` IN (83932,83972,84001);
+DELETE FROM `creature_addon` WHERE `guid` IN (83932,83972,84001);
+-- =========================================
+-- Dungeon Aggro Linking and Missing Pathing
+-- =========================================
+-- First Sentry
+UPDATE `creature` SET `position_x` = 2076.810547, `position_y` = 221.063431, `position_z` = 64.874046, `orientation` = 2.525145 WHERE `guid` = 83909;
+
+-- Group Inside Left Side
+UPDATE `creature` SET `position_x` = 2120.338867, `position_y` = 218.720917, `position_z` = 64.943527, `orientation` = 1.668277 WHERE `guid` = 83904;
+UPDATE `creature` SET `position_x` = 2119.321777, `position_y` = 223.663712, `position_z` = 64.875153, `orientation` = 4.992080 WHERE `guid` = 83903;
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83904;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83904, 83904, 0, 0, 2, 0, 0),
+(83904, 83903, 0, 0, 2, 0, 0);
+
+-- Patrol Left Side
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83910;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83910, 83910, 0, 0, 2, 0, 0),
+(83910, 83911, 3, 0, 2, 0, 0);
+
+SET @NPC := 83910;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2125.69, 244.969, 64.8252, 0),
+(@PATH, 2, 2131.14, 252.046, 64.6015, 0),
+(@PATH, 3, 2139.33, 256.24, 64.7451, 0),
+(@PATH, 4, 2150.85, 267.235, 64.6691, 0),
+(@PATH, 5, 2155.83, 274.518, 64.5514, 0),
+(@PATH, 6, 2163.31, 279.487, 64.169, 0),
+(@PATH, 7, 2175.15, 282.002, 64.6837, 0),
+(@PATH, 8, 2163.53, 279.529, 64.0731, 0),
+(@PATH, 9, 2155.76, 274, 64.4975, 0),
+(@PATH, 10, 2150.68, 266.361, 64.7104, 0),
+(@PATH, 11, 2139.27, 255.903, 64.7643, 0),
+(@PATH, 12, 2131.48, 252.035, 64.5098, 0),
+(@PATH, 13, 2125.25, 244.493, 64.8279, 0),
+(@PATH, 14, 2119.97, 233.879, 64.8725, 0),
+(@PATH, 15, 2112.98, 230.424, 65.0613, 0),
+(@PATH, 16, 2106.37, 226.722, 65.8853, 0),
+(@PATH, 17, 2120.01, 233.507, 64.8737, 0);
+
+-- 2 Guards on Bridge
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83901;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83901, 83901, 0, 0, 2, 0, 0),
+(83901, 83902, 0, 0, 2, 0, 0);
+
+-- 2 Guards on Bridge
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83912;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83912, 83912, 0, 0, 2, 0, 0),
+(83912, 83913, 0, 0, 2, 0, 0);
+
+-- NPC Pathing Over Bridge Up Hill
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83907;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83907, 83907, 0, 0, 2, 0, 0),
+(83907, 83906, 3, 0, 2, 0, 0);
+
+SET @NPC := 83907;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2133.25, 175.897, 68.2518, 0),
+(@PATH, 2, 2142.45, 168.965, 66.2217, 0),
+(@PATH, 3, 2143.95, 162.492, 65.283, 0),
+(@PATH, 4, 2139.32, 154.392, 67.4044, 0),
+(@PATH, 5, 2138.23, 143.395, 70.7358, 0),
+(@PATH, 6, 2139.97, 132.573, 74.0745, 0),
+(@PATH, 7, 2142.59, 126.72, 75.6225, 0),
+(@PATH, 8, 2146.19, 125.347, 76.3226, 0),
+(@PATH, 9, 2153.81, 128.848, 79.1896, 0),
+(@PATH, 10, 2161.36, 135.221, 83.6257, 0),
+(@PATH, 11, 2169.32, 144.168, 87.0686, 0),
+(@PATH, 12, 2176.57, 157.486, 87.5667, 0),
+(@PATH, 13, 2182.25, 166.023, 88.0925, 0),
+(@PATH, 14, 2190.15, 171.974, 88.9953, 0),
+(@PATH, 15, 2198.18, 175.07, 90.0099, 0),
+(@PATH, 16, 2211.11, 177.332, 93.1255, 0),
+(@PATH, 17, 2218.76, 179.856, 96.8824, 0),
+(@PATH, 18, 2211.71, 177.317, 93.3128, 0),
+(@PATH, 19, 2198.41, 175.057, 90.0273, 0),
+(@PATH, 20, 2190.48, 171.961, 89.0125, 0),
+(@PATH, 21, 2182.36, 165.732, 88.0739, 0),
+(@PATH, 22, 2176.82, 157.265, 87.5719, 0),
+(@PATH, 23, 2169.84, 144.243, 87.1995, 0),
+(@PATH, 24, 2161.79, 135.187, 83.7742, 0),
+(@PATH, 25, 2153.85, 128.339, 79.1086, 0),
+(@PATH, 26, 2146.26, 125.303, 76.3378, 0),
+(@PATH, 27, 2142.64, 126.864, 75.6126, 0),
+(@PATH, 28, 2139.95, 133.04, 73.9752, 0),
+(@PATH, 29, 2138.51, 143.182, 70.7858, 0),
+(@PATH, 30, 2139.87, 154.51, 67.3187, 0),
+(@PATH, 31, 2144.53, 162.434, 65.2721, 0),
+(@PATH, 32, 2142.94, 168.955, 66.2216, 0),
+(@PATH, 33, 2133.65, 175.448, 68.0162, 0),
+(@PATH, 34, 2121.96, 184.319, 69.1957, 0),
+(@PATH, 35, 2111.52, 191.525, 66.2216, 0),
+(@PATH, 36, 2105.32, 194.886, 65.1854, 0),
+(@PATH, 37, 2097.08, 196.945, 65.2138, 0),
+(@PATH, 38, 2087.51, 206.91, 64.8803, 0),
+(@PATH, 39, 2073.1, 218.576, 64.8744, 0),
+(@PATH, 40, 2087.7, 206.877, 64.8792, 0),
+(@PATH, 41, 2097.34, 196.53, 65.2196, 0),
+(@PATH, 42, 2106.11, 194.526, 65.4583, 0),
+(@PATH, 43, 2111.96, 191.221, 66.2215, 0),
+(@PATH, 44, 2119.36, 186.393, 68.9396, 0);
+
+-- Spectator Pit
+UPDATE `creature` SET `position_x` = 2175.081055, `position_y` = 53.507755, `position_z` = 66.141853, `orientation` = 4.365011 WHERE `guid` = 83979;
+UPDATE `creature` SET `position_x` = 2179.469482, `position_y` = 52.001755, `position_z` = 66.185760, `orientation` = 4.242488 WHERE `guid` = 83978;
+UPDATE `creature` SET `position_x` = 2184.879639, `position_y` = 50.181683, `position_z` = 66.242325, `orientation` = 4.201647 WHERE `guid` = 83981;
+UPDATE `creature` SET `position_x` = 2192.822998, `position_y` = 12.869001, `position_z` = 66.117027, `orientation` = 2.702322 WHERE `guid` = 83983;
+UPDATE `creature` SET `position_x` = 2175.076904, `position_y` = 1.1307310, `position_z` = 66.122726, `orientation` = 1.262686 WHERE `guid` = 83984;
+UPDATE `creature` SET `position_x` = 2171.402344, `position_y` = 5.1749520, `position_z` = 64.843498, `orientation` = 1.235983 WHERE `guid` = 83985;
+
+-- Rifleman Pathing In First Pit
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83930;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83930, 83930, 0, 0, 2, 0, 0),
+(83930, 83931, 3, 0, 2, 0, 0);
+
+SET @NPC := 83930;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2097.15, 78.6796, 53.0115, 0),
+(@PATH, 2, 2084, 97.0058, 53.0813, 0),
+(@PATH, 3, 2085.25, 114.295, 52.441, 0),
+(@PATH, 4, 2095.02, 133.882, 52.9715, 0),
+(@PATH, 5, 2093.37, 143.542, 52.4456, 0),
+(@PATH, 6, 2086.79, 145.567, 52.562, 0),
+(@PATH, 7, 2078.89, 146.163, 52.8694, 0),
+(@PATH, 8, 2070.16, 149.051, 55.0808, 0),
+(@PATH, 9, 2063.53, 144.524, 54.8516, 0),
+(@PATH, 10, 2056.3, 129.417, 54.886, 0),
+(@PATH, 11, 2051.2, 117.43, 55.0246, 0),
+(@PATH, 12, 2048.74, 106.082, 53.8027, 0),
+(@PATH, 13, 2048.45, 90.0419, 53.1851, 0),
+(@PATH, 14, 2050.02, 77.0256, 52.9052, 0),
+(@PATH, 15, 2054.85, 66.9206, 52.6482, 0),
+(@PATH, 16, 2061.25, 59.5255, 53.1247, 0),
+(@PATH, 17, 2069.13, 53.5553, 53.9244, 0),
+(@PATH, 18, 2080.77, 46.2151, 54.041, 0),
+(@PATH, 19, 2092.03, 40.4852, 52.8246, 0),
+(@PATH, 20, 2105.15, 34.4171, 52.6789, 0),
+(@PATH, 21, 2114.6, 29.6927, 53.7685, 0),
+(@PATH, 22, 2123.67, 31.693, 52.861, 0),
+(@PATH, 23, 2132.42, 42.8707, 52.6342, 0),
+(@PATH, 24, 2131.65, 53.1806, 52.441, 0),
+(@PATH, 25, 2120.27, 60.1946, 52.4814, 0),
+(@PATH, 26, 2112.77, 67.7052, 52.5274, 0);
+
+SET @NPC := 83934;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2068.01, 74.9858, 53.7438, 0),
+(@PATH, 2, 2064.53, 81.5845, 54.0444, 0),
+(@PATH, 3, 2061.73, 86.8158, 54.1236, 0),
+(@PATH, 4, 2059.31, 88.1866, 54.1046, 0),
+(@PATH, 5, 2055.28, 86.614, 54.1177, 0),
+(@PATH, 6, 2065.6, 90.6067, 54.099, 0),
+(@PATH, 7, 2067.63, 84.4378, 54.0945, 0),
+(@PATH, 8, 2065.46, 78.7869, 53.9266, 0),
+(@PATH, 9, 2069.08, 72.6753, 53.646, 0),
+(@PATH, 10, 2071.68, 67.8529, 53.761, 0),
+(@PATH, 11, 2075.62, 68.0539, 53.7892, 0),
+(@PATH, 12, 2081.12, 70.4489, 53.7591, 0),
+(@PATH, 13, 2076.01, 68.0177, 53.7933, 0),
+(@PATH, 14, 2072.07, 67.7785, 53.767, 0);
+
+-- Third Hut Guards
+UPDATE `creature` SET `position_x` = 2066.639893, `position_y` = 142.899033, `position_z` = 53.258968, `orientation` = 2.797679 WHERE `guid` = 83924;
+UPDATE `creature` SET `position_x` = 2072.268311, `position_y` = 105.922432, `position_z` = 53.294781, `orientation` = 5.891366 WHERE `guid` = 83922;
+
+-- Guards Under The Bridge
+UPDATE `creature` SET `position_x` = 2126.438477, `position_y` = 175.292297, `position_z` = 53.516026, `orientation` = 1.561665 WHERE `guid` = 83945;
+UPDATE `creature` SET `position_x` = 2129.196533, `position_y` = 177.595200, `position_z` = 54.084316, `orientation` = 3.192937 WHERE `guid` = 83944;
+UPDATE `creature` SET `position_x` = 2121.649658, `position_y` = 179.502533, `position_z` = 53.181751, `orientation` = 0.586199 WHERE `guid` = 83942;
+UPDATE `creature` SET `position_x` = 2124.063232, `position_y` = 183.331512, `position_z` = 52.779934, `orientation` = 4.016817 WHERE `guid` = 83943;
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83945;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83945, 83945, 0, 0, 2, 0, 0),
+(83945, 83942, 0, 0, 2, 0, 0),
+(83945, 83943, 0, 0, 2, 0, 0),
+(83945, 83944, 0, 0, 2, 0, 0);
+
+-- Pathing Sentry in Orc Pit
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83950;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83950, 83950, 0, 0, 2, 0, 0),
+(83950, 83951, 3, 0, 2, 0, 0);
+
+SET @NPC := 83950;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2194.76, 228.093, 53.2216, 0),
+(@PATH, 2, 2177.35, 222.908, 52.5617, 0),
+(@PATH, 3, 2155.81, 211.125, 52.9491, 0),
+(@PATH, 4, 2136.14, 190.397, 52.6035, 0),
+(@PATH, 5, 2123.86, 177.449, 52.5751, 0),
+(@PATH, 6, 2118.74, 164.827, 52.473, 0),
+(@PATH, 7, 2111.26, 150.577, 52.441, 0),
+(@PATH, 8, 2109.52, 133.664, 52.441, 0),
+(@PATH, 9, 2112.11, 113.823, 52.5069, 0),
+(@PATH, 10, 2116.1, 88.3774, 52.5566, 0),
+(@PATH, 11, 2119.94, 64.779, 52.668, 0),
+(@PATH, 12, 2126.07, 55.7297, 52.4422, 0),
+(@PATH, 13, 2142.26, 44.6962, 52.5726, 0),
+(@PATH, 14, 2126.15, 55.8954, 52.441, 0),
+(@PATH, 15, 2119.89, 64.841, 52.6693, 0),
+(@PATH, 16, 2119.19, 77.1831, 52.6315, 0),
+(@PATH, 17, 2114.45, 101.229, 52.4411, 0),
+(@PATH, 18, 2110.13, 129.652, 52.4412, 0),
+(@PATH, 19, 2109.8, 142.596, 52.4415, 0),
+(@PATH, 20, 2111.71, 151, 52.4422, 0),
+(@PATH, 21, 2118.62, 163.934, 52.4958, 0),
+(@PATH, 22, 2124.02, 177.071, 52.6379, 0),
+(@PATH, 23, 2128.47, 184.045, 52.8829, 0),
+(@PATH, 24, 2141.11, 193.758, 52.4788, 0),
+(@PATH, 25, 2155.71, 210.856, 52.963, 0),
+(@PATH, 26, 2166.12, 216.871, 52.784, 0);
+
+
+-- Pathing Sentry in Orc Pit
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83962;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83962, 83962, 0, 0, 2, 0, 0),
+(83962, 83963, 3, 0, 2, 0, 0);
+
+SET @NPC := 83962;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2179.58, 272.553, 53.7907, 0),
+(@PATH, 2, 2174.51, 273.75, 54.7804, 0),
+(@PATH, 3, 2167.73, 270.116, 53.8525, 0),
+(@PATH, 4, 2158.07, 262.467, 54.2476, 0),
+(@PATH, 5, 2148.58, 254.01, 53.6444, 0),
+(@PATH, 6, 2142.06, 248.19, 54.5281, 0),
+(@PATH, 7, 2141.05, 241.971, 54.0081, 0),
+(@PATH, 8, 2151.24, 228.01, 52.5662, 0),
+(@PATH, 9, 2157.59, 225.422, 52.5796, 0),
+(@PATH, 10, 2163.86, 228.987, 52.4411, 0),
+(@PATH, 11, 2171.11, 238.58, 52.4803, 0),
+(@PATH, 12, 2186.56, 250.708, 52.672, 0),
+(@PATH, 13, 2195.97, 250.156, 52.441, 0),
+(@PATH, 14, 2204.23, 245.158, 53.3357, 0),
+(@PATH, 15, 2220.32, 235.855, 52.5448, 0),
+(@PATH, 16, 2225.11, 237.303, 53.2101, 0),
+(@PATH, 17, 2231.1, 247.145, 53.7591, 0),
+(@PATH, 18, 2233.59, 253.688, 54.8861, 0),
+(@PATH, 19, 2233.58, 256.145, 55.5751, 0),
+(@PATH, 20, 2228.66, 260.389, 54.1031, 0),
+(@PATH, 21, 2226.51, 259.921, 53.4273, 0),
+(@PATH, 22, 2222.34, 253.34, 53.7322, 0),
+(@PATH, 23, 2206.44, 263.036, 54.0515, 0),
+(@PATH, 24, 2196.3, 260.947, 54.0427, 0),
+(@PATH, 25, 2194.69, 256.858, 54.0644, 0),
+(@PATH, 26, 2191.63, 251.755, 52.4522, 0),
+(@PATH, 27, 2189.27, 255.95, 52.4471, 0),
+(@PATH, 28, 2184.46, 262.837, 52.4412, 0),
+(@PATH, 29, 2187.25, 272.681, 52.8813, 0);
+
+-- Fifth Hut Guards
+UPDATE `creature` SET `position_x` = 2224.243652, `position_y` = 261.026978, `position_z` = 52.870918, `orientation` = 1.083381 WHERE `guid` = 83956;
+UPDATE `creature` SET `position_x` = 2228.397461, `position_y` = 258.271484, `position_z` = 53.144829, `orientation` = 1.235748 WHERE `guid` = 83955;
+
+SET @NPC := 83958;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2202.6, 261.304, 54.0827, 0),
+(@PATH, 2, 2210.13, 261.506, 53.8936, 0),
+(@PATH, 3, 2222.63, 253.593, 53.7344, 0),
+(@PATH, 4, 2226.35, 258.649, 53.6825, 0),
+(@PATH, 5, 2222.54, 252.893, 53.7423, 0),
+(@PATH, 6, 2215.13, 253.523, 53.6058, 0),
+(@PATH, 7, 2203.69, 260.036, 54.0857, 0),
+(@PATH, 8, 2196.83, 260.845, 54.0447, 0),
+(@PATH, 9, 2194.18, 256.059, 54.0261, 0),
+(@PATH, 10, 2196.6, 259.593, 54.0522, 0);
+
+-- Group of 4 NPC at Top of Hill
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83966;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83966, 83966, 0, 0, 2, 0, 0),
+(83966, 83967, 0, 0, 2, 0, 0),
+(83966, 83968, 0, 0, 2, 0, 0),
+(83966, 83969, 0, 0, 2, 0, 0);
+
+-- Group of 4 NPC In Front of Castle
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83935;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83935, 83935, 0, 0, 2, 0, 0),
+(83935, 83936, 0, 0, 2, 0, 0),
+(83935, 83937, 0, 0, 2, 0, 0),
+(83935, 83938, 0, 0, 2, 0, 0);
+
+-- Sentry Pathing in Castle
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83940;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83940, 83940, 0, 0, 2, 0, 0),
+(83940, 83941, 3, 0, 2, 0, 0);
+
+SET @NPC := 83940;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2205.2, 105.548, 89.4549, 0),
+(@PATH, 2, 2198.16, 109.399, 89.4549, 0),
+(@PATH, 3, 2203.92, 119.75, 89.4549, 0),
+(@PATH, 4, 2208.63, 128.602, 87.9559, 0),
+(@PATH, 5, 2197.29, 135.558, 88.2163, 0),
+(@PATH, 6, 2177.38, 147.178, 88.2163, 0),
+(@PATH, 7, 2197.46, 135.325, 88.2164, 0),
+(@PATH, 8, 2209.19, 128.465, 87.9552, 0),
+(@PATH, 9, 2214.03, 138.222, 89.4554, 0),
+(@PATH, 10, 2219.53, 148.379, 89.4554, 0),
+(@PATH, 11, 2230.54, 142.295, 89.4554, 0),
+(@PATH, 12, 2224.32, 132.35, 89.4554, 0),
+(@PATH, 13, 2221.97, 128.721, 89.4554, 0),
+(@PATH, 14, 2229.83, 124.014, 89.4554, 0),
+(@PATH, 15, 2234.85, 117.573, 89.4554, 0),
+(@PATH, 16, 2230.33, 109.712, 93.3835, 0),
+(@PATH, 17, 2217.21, 116.93, 98.2768, 0),
+(@PATH, 18, 2211.69, 106.844, 98.2768, 0),
+(@PATH, 19, 2195.58, 116.127, 103.378, 0),
+(@PATH, 20, 2204.6, 131.978, 103.378, 0),
+(@PATH, 21, 2213.31, 147.498, 103.378, 0),
+(@PATH, 22, 2229.43, 138.021, 98.2767, 0),
+(@PATH, 23, 2217.65, 116.955, 98.2767, 0),
+(@PATH, 24, 2230.53, 109.677, 93.3836, 0),
+(@PATH, 25, 2234.87, 117.489, 89.455, 0),
+(@PATH, 26, 2229.99, 124.125, 89.455, 0),
+(@PATH, 27, 2222.32, 128.306, 89.455, 0),
+(@PATH, 28, 2209.61, 106.255, 89.455, 0);
+
+-- Guards Sleeping In Castle
+UPDATE `creature` SET `position_x` = 2230.499756, `position_y` = 96.335007, `position_z` = 91.719383, `orientation` = 1.130164 WHERE `guid` = 83457;
+UPDATE `creature` SET `position_x` = 2222.566895, `position_y` = 88.888351, `position_z` = 91.591484, `orientation` = 2.629882 WHERE `guid` = 83977;
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83457;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83457, 83457, 0, 0, 2, 0, 0),
+(83457, 83977, 0, 0, 2, 0, 0);
+
+DELETE FROM `creature_addon` WHERE `guid` IN (83457,83977);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83457,0,0,3,0,0, ''),
+(83977,0,0,3,0,0, '');
+
+-- NPC Upstairs in Castle
+UPDATE `creature` SET `position_x` = 2207.863525, `position_y` = 125.211838, `position_z` = 103.378456, `orientation` = 1.097563 WHERE `guid` = 83976;
+UPDATE `creature` SET `position_x` = 2209.415283, `position_y` = 126.366081, `position_z` = 103.378456, `orientation` = 4.006677 WHERE `guid` = 83975;
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83976;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83976, 83976, 0, 0, 2, 0, 0),
+(83976, 83975, 0, 0, 2, 0, 0),
+(83976, 83973, 0, 0, 2, 0, 0),
+(83976, 83974, 0, 0, 2, 0, 0);
+
+-- Group of 4 NPC Main Floor of Castle
+UPDATE `creature` SET `position_x` = 2218.045166, `position_y` = 125.936539, `position_z` = 89.454872, `orientation` = 5.212229 WHERE `guid` = 83997;
+UPDATE `creature` SET `position_x` = 2224.622559, `position_y` = 123.511497, `position_z` = 89.454872, `orientation` = 4.141731 WHERE `guid` = 83996;
+
+-- Guards In Tower Near Castle
+DELETE FROM `creature_formations` WHERE `leaderGUID`=42939;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(42939, 42939, 0, 0, 2, 0, 0),
+(42939, 48019, 0, 0, 2, 0, 0),
+(42939, 48020, 0, 0, 2, 0, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=41813;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(41813, 41813, 0, 0, 2, 0, 0),
+(41813, 48017, 0, 0, 2, 0, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=48015;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(48015, 48015, 0, 0, 2, 0, 0),
+(48015, 48016, 0, 0, 2, 0, 0);
+
+-- ONLY USE THESE GUIDS PLEASE :) (already rechecked them on clean tc with free-guid-searcher, some spawns in the instance had to be removed and reinserted again)
+-- the used guids are assigned to some waypoints later
+DELETE FROM `creature` WHERE `guid` IN (83932, 83972, 83933, 77820, 77854, 83959, 77819, 83923, 77818, 83926, 77817, 77816, 83928, 83929, 6998, 77806);
+DELETE FROM `creature_addon` WHERE `guid` IN (83932, 83972, 83933, 77820, 77854, 83959, 77819, 83923, 77818, 83926, 77817, 77816, 83928, 83929, 6998, 77806);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`) VALUES 
+(6998, 17819, 560, 3, 0, 0, 2257.46, 259.449, 65.0975, 1.53443, 86400, 0, 0, 17736, 0, 0),
+(77806, 17819, 560, 3, 0, 0, 2256.79, 264.135, 64.8945, 4.74278, 86400, 0, 0, 17736, 0, 0),
+(77816, 17819, 560, 3, 0, 0, 2090.35, 44.7203, 52.4421, 4.33673, 86400, 0, 0, 18345, 0, 0),
+(77817, 17819, 560, 3, 0, 0, 2055.22, 83.8672, 52.4861, 3.67686, 86400, 0, 0, 18345, 0, 0),
+(77818, 17820, 560, 3, 0, 0, 2068.6, 112.257, 54.68, 1.89859, 86400, 0, 0, 17736, 0, 0),
+(77819, 17833, 560, 3, 0, 0, 2160.93, 236.505, 53.8958, 2.18764, 86400, 0, 0, 14674, 14665, 0),
+(77820, 17820, 560, 3, 0, 0, 2191.83, 256.39, 52.4411, 4.17236, 86400, 0, 0, 18345, 0, 0),
+(77854, 17833, 560, 3, 0, 0, 2195.78, 253.736, 52.441, 4.13466, 86400, 0, 0, 14674, 14665, 0),
+(83923, 17833, 560, 3, 0, 0, 2074.58, 110.82, 53.3224, 5.9597, 86400, 0, 0, 14674, 14665, 0),
+(83926, 17833, 560, 3, 0, 0, 2082.72, 73.9288, 52.442, 0.525837, 86400, 0, 0, 14674, 14665, 0),
+(83928, 17820, 560, 3, 0, 0, 2117.43, 54.716, 52.5916, 1.17158, 86400, 0, 0, 17736, 0, 0),
+(83929, 17833, 560, 3, 0, 0, 2122.75, 52.3503, 52.441, 1.11189, 86400, 0, 0, 14674, 14665, 0),
+(83932, 18598, 560, 3, 0, 0, 2086.52, 95.0915, 52.9514, 5.15978, 86400, 10, 0, 5914, 0, 1),
+(83933, 17860, 560, 3, 0, 0, 2217.04, 123.922, 89.4549, 0.339619, 86400, 0, 0, 18345, 0, 0),
+(83959, 17819, 560, 3, 0, 0, 2170.79, 268.471, 52.9163, 2.42404, 86400, 0, 0, 17736, 0, 0),
+(83972, 17815, 560, 3, 0, 0, 2321.19, 886.26, 92.7589, 5.98453, 86400, 0, 0, 17151, 0, 2);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=6998;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(6998, 6998, 0, 0, 2, 0, 0),
+(6998, 77806, 0, 0, 2, 0, 0);
+
+-- enable movement for these fuckers
+-- Durnholde Rifleman SAI
+SET @ENTRY := 17820;
+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,2,0,0,2300,5000,11,16100,64,0,0,0,0,2,0,0,0,0,0,0,0,"Durnholde Rifleman - In Combat CMC - Cast 'Shoot' (Normal Dungeon)"),
+(@ENTRY,0,1,0,0,0,100,4,0,0,2300,5000,11,22907,64,0,0,0,0,2,0,0,0,0,0,0,0,"Durnholde Rifleman - In Combat CMC - Cast 'Shoot' (Heroic Dungeon)"),
+(@ENTRY,0,2,0,9,0,100,2,5,30,9000,15000,11,31942,1,0,0,0,0,2,0,0,0,0,0,0,0,"Durnholde Rifleman - Within 5-30 Range - Cast 'Multi-Shot' (Normal Dungeon)"),
+(@ENTRY,0,3,0,9,0,100,4,5,30,9000,15000,11,38383,1,0,0,0,0,2,0,0,0,0,0,0,0,"Durnholde Rifleman - Within 5-30 Range - Cast 'Multi-Shot' (Heroic Dungeon)"),
+(@ENTRY,0,4,0,2,0,100,7,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Durnholde Rifleman - Between 0-15% Health - Flee For Assist (No Repeat) (Dungeon)");
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83929;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83929, 83929, 0, 0, 2, 0, 0),
+(83929, 83928, 0, 0, 2, 0, 0),
+(83929, 83986, 0, 0, 2, 0, 0),
+(83929, 77816, 0, 0, 2, 0, 0);
+
+SET @NPC := 77818;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2067.58, 120.639, 54.6068, 0),
+(@PATH, 2, 2068.65, 124.579, 54.4448, 0),
+(@PATH, 3, 2073.17, 136.186, 54.3431, 0),
+(@PATH, 4, 2067.19, 140.195, 54.3051, 0),
+(@PATH, 5, 2074.04, 136.275, 54.3549, 0),
+(@PATH, 6, 2069.37, 129.214, 54.2632, 0),
+(@PATH, 7, 2065.92, 119.088, 54.6917, 0),
+(@PATH, 8, 2067.54, 110.605, 54.6653, 0),
+(@PATH, 9, 2071.76, 108.894, 54.6828, 0),
+(@PATH, 10, 2069.07, 110.515, 54.6717, 0);
+
+SET @NPC := 77819;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2157.48, 240.365, 53.8761, 0),
+(@PATH, 2, 2157.15, 245.379, 53.9002, 0),
+(@PATH, 3, 2163.3, 256.598, 53.5643, 0),
+(@PATH, 4, 2172.27, 263.614, 53.5644, 0),
+(@PATH, 5, 2169.42, 266.65, 53.5095, 0),
+(@PATH, 6, 2176.24, 257.534, 53.5725, 0),
+(@PATH, 7, 2166.49, 248.773, 53.6714, 0),
+(@PATH, 8, 2157.53, 240.79, 53.88, 0),
+(@PATH, 9, 2161.49, 235.735, 53.8969, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83971;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83971, 83971, 0, 0, 2, 0, 0),
+(83971, 83996, 0, 0, 2, 0, 0),
+(83971, 83997, 0, 0, 2, 0, 0),
+(83971, 83933, 0, 0, 2, 0, 0);
+
+-- The Cook in the Castle
+SET @NPC := 83970;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,69, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2200.8, 154.304, 89.4549, 0),
+(@PATH, 2, 2201.31, 153.99, 89.455, 10000),
+(@PATH, 3, 2201.6, 156.055, 89.455, 0),
+(@PATH, 4, 2201.02, 156.09, 89.455, 10000),
+(@PATH, 5, 2202.06, 156.634, 89.455, 0),
+(@PATH, 6, 2204.48, 160.807, 89.455, 0),
+(@PATH, 7, 2204.82, 160.47, 89.4549, 10000);
+
+-- Armorer Pathing in Castle
+SET @NPC := 83939;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,69, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2186.46, 118.12, 89.4552, 0),
+(@PATH, 2, 2188.81, 120.799, 89.4552, 12000),
+(@PATH, 3, 2180.05, 118.042, 89.4552, 12000),
+(@PATH, 4, 2183.88, 115.816, 89.4552, 0),
+(@PATH, 5, 2182.72, 111.643, 89.4552, 12000);
+
+-- =======================
+-- Outside of Castle Stuff
+-- =======================
+
+-- enable movement for these fuckers
+-- Lordaeron Sentry SAI
+SET @ENTRY := 17815;
+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,2,0,0,2300,5000,11,15620,64,0,0,0,0,2,0,0,0,0,0,0,0,"Lordaeron Sentry - In Combat CMC - Cast 'Shoot' (Normal Dungeon)"),
+(@ENTRY,0,1,0,0,0,100,4,0,0,2300,5000,11,16100,64,0,0,0,0,2,0,0,0,0,0,0,0,"Lordaeron Sentry - In Combat CMC - Cast 'Shoot' (Heroic Dungeon)"),
+(@ENTRY,0,2,0,2,0,100,7,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lordaeron Sentry - Between 0-15% Health - Flee For Assist (No Repeat) (Dungeon)");
+
+-- On Castle
+SET @NPC := 83972;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2325.11, 885.167, 90.6113, 0),
+(@PATH, 2, 2331.89, 884.099, 87.1758, 0),
+(@PATH, 3, 2332.94, 887.052, 86.7539, 0),
+(@PATH, 4, 2331.14, 890.154, 85.6413, 0),
+(@PATH, 5, 2327.28, 892.536, 83.7337, 0),
+(@PATH, 6, 2323.33, 892.184, 81.9012, 0),
+(@PATH, 7, 2318.98, 887.176, 81.6081, 0),
+(@PATH, 8, 2318.69, 882.293, 79.2719, 0),
+(@PATH, 9, 2320.56, 879.062, 77.5579, 0),
+(@PATH, 10, 2325.94, 876.844, 76.9868, 0),
+(@PATH, 11, 2330.77, 877.674, 75.7722, 0),
+(@PATH, 12, 2335, 882.021, 72.2668, 0),
+(@PATH, 13, 2333.83, 889.01, 71.3798, 0),
+(@PATH, 14, 2332.53, 893.004, 70.1646, 0),
+(@PATH, 15, 2326.51, 894.765, 67.1477, 0),
+(@PATH, 16, 2322.01, 894.088, 65.5546, 0),
+(@PATH, 17, 2317.43, 890.326, 65.1353, 0),
+(@PATH, 18, 2316.2, 886.194, 63.7357, 0),
+(@PATH, 19, 2318.93, 879.756, 62.315, 0),
+(@PATH, 20, 2323.42, 876.041, 59.9463, 0),
+(@PATH, 21, 2328.9, 876.302, 57.6755, 0),
+(@PATH, 22, 2333.22, 882.887, 57.671, 0),
+(@PATH, 23, 2330.23, 891.656, 57.6677, 0),
+(@PATH, 24, 2330.97, 895.891, 57.6647, 0),
+(@PATH, 25, 2333.62, 903.478, 57.6647, 0),
+(@PATH, 26, 2327.67, 905.549, 57.6647, 0),
+(@PATH, 27, 2316.2, 902.56, 57.569, 0),
+(@PATH, 28, 2310.06, 898.124, 57.6648, 0),
+(@PATH, 29, 2306.3, 891.68, 57.6648, 0),
+(@PATH, 30, 2305.38, 884.853, 57.6648, 0),
+(@PATH, 31, 2306.64, 877.848, 57.5939, 0),
+(@PATH, 32, 2311.01, 870.276, 57.6642, 0),
+(@PATH, 33, 2318.98, 865.217, 57.5566, 0),
+(@PATH, 34, 2328.33, 863.818, 57.6633, 0),
+(@PATH, 35, 2336.48, 867.295, 57.574, 0),
+(@PATH, 36, 2343.45, 873.318, 57.663, 0),
+(@PATH, 37, 2346.58, 879.571, 57.663, 0),
+(@PATH, 38, 2346.54, 888.088, 57.5692, 0),
+(@PATH, 39, 2343.96, 895.954, 57.6645, 0),
+(@PATH, 40, 2339.83, 900.705, 57.6645, 0),
+(@PATH, 41, 2333.78, 903.467, 57.6645, 0),
+(@PATH, 42, 2330.4, 896.083, 57.6645, 0),
+(@PATH, 43, 2329.77, 889.734, 57.6676, 0),
+(@PATH, 44, 2331.14, 878.867, 57.6683, 0),
+(@PATH, 45, 2328.35, 875.736, 57.8588, 0),
+(@PATH, 46, 2323.37, 875.52, 59.9245, 0),
+(@PATH, 47, 2319.42, 878.762, 61.8416, 0),
+(@PATH, 48, 2316.99, 883.931, 62.4409, 0),
+(@PATH, 49, 2316.51, 886.569, 63.8636, 0),
+(@PATH, 50, 2318.53, 890.77, 65.1821, 0),
+(@PATH, 51, 2322.68, 893.593, 65.555, 0),
+(@PATH, 52, 2327.67, 893.958, 67.6509, 0),
+(@PATH, 53, 2331.42, 891.878, 69.8271, 0),
+(@PATH, 54, 2334.07, 888.412, 71.3795, 0),
+(@PATH, 55, 2334.68, 882.853, 71.8615, 0),
+(@PATH, 56, 2333.31, 879.767, 73.7331, 0),
+(@PATH, 57, 2329.96, 877.462, 76.232, 0),
+(@PATH, 58, 2326.87, 877.048, 76.9683, 0),
+(@PATH, 59, 2321.05, 879.39, 77.3211, 0),
+(@PATH, 60, 2319.01, 882.819, 79.3952, 0),
+(@PATH, 61, 2319.14, 886.792, 81.5905, 0),
+(@PATH, 62, 2323.52, 891.644, 81.8, 0),
+(@PATH, 63, 2326.09, 892.595, 83.1418, 0),
+(@PATH, 64, 2329.49, 891.449, 84.9086, 0),
+(@PATH, 65, 2331.62, 888.864, 86.2302, 0),
+(@PATH, 66, 2332.31, 886.586, 87.176, 0),
+(@PATH, 67, 2331.76, 884.452, 87.176, 0),
+(@PATH, 68, 2322.23, 885.951, 92.7589, 0);
+
+-- Group of 3 walking on Path Near Castle
+DELETE FROM `creature_formations` WHERE `leaderGUID`=31799;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(31799, 31799, 0, 0, 2, 0, 0),
+(31799, 48021, 3, 60, 2, 0, 0),
+(31799, 48022, 3, 300, 2, 0, 0);
+
+SET @NPC := 31799;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2018.19, 313.412, 66.0958, 0),
+(@PATH, 2, 2027.78, 329.65, 66.0986, 0),
+(@PATH, 3, 2039.14, 346.798, 66.072, 0),
+(@PATH, 4, 2050.96, 374.133, 65.9613, 0),
+(@PATH, 5, 2058.06, 390.457, 66.0772, 0),
+(@PATH, 6, 2068.54, 411.057, 66.0615, 0),
+(@PATH, 7, 2073.09, 421.154, 66.1363, 0),
+(@PATH, 8, 2079.13, 440.491, 66.2517, 0),
+(@PATH, 9, 2087.18, 466.869, 65.9002, 0),
+(@PATH, 10, 2093.36, 483.083, 64.6249, 0),
+(@PATH, 11, 2100.55, 496.159, 62.1489, 0),
+(@PATH, 12, 2111.38, 509.983, 59.3541, 0),
+(@PATH, 13, 2124.28, 522.055, 56.8856, 0),
+(@PATH, 14, 2136.51, 535.415, 54.6722, 0),
+(@PATH, 15, 2151.66, 551.229, 50.4063, 0),
+(@PATH, 16, 2161.32, 566.353, 46.8987, 0),
+(@PATH, 17, 2168.07, 588.288, 42.1267, 0),
+(@PATH, 18, 2171.31, 606.029, 39.5882, 0),
+(@PATH, 19, 2172.69, 622.375, 36.9113, 0),
+(@PATH, 20, 2175.5, 641.143, 33.8056, 0),
+(@PATH, 21, 2172.7, 627.72, 35.6883, 0),
+(@PATH, 22, 2170.41, 607.085, 39.4374, 0),
+(@PATH, 23, 2167.23, 590.177, 41.9199, 0),
+(@PATH, 24, 2161.95, 569.422, 46.211, 0),
+(@PATH, 25, 2158.41, 562.069, 48.0236, 0),
+(@PATH, 26, 2148.92, 549.403, 50.956, 0),
+(@PATH, 27, 2136.91, 535.789, 54.5421, 0),
+(@PATH, 28, 2130.16, 527.157, 56.0405, 0),
+(@PATH, 29, 2108.82, 509.232, 59.6871, 0),
+(@PATH, 30, 2098.32, 493.48, 62.7374, 0),
+(@PATH, 31, 2087.92, 471.897, 65.8437, 0),
+(@PATH, 32, 2083.84, 458.354, 66.1229, 0),
+(@PATH, 33, 2078.36, 437.542, 66.2739, 0),
+(@PATH, 34, 2072.13, 419.858, 66.1159, 0),
+(@PATH, 35, 2057.47, 392.51, 66.058, 0),
+(@PATH, 36, 2047.37, 367.993, 66.0416, 0),
+(@PATH, 37, 2037.51, 345.576, 66.064, 0),
+(@PATH, 38, 2023.41, 323.477, 66.0973, 0),
+(@PATH, 39, 2014.63, 305.342, 66.0953, 0),
+(@PATH, 40, 2002.65, 287.829, 66.1836, 0),
+(@PATH, 41, 1991.13, 272.215, 66.9844, 0),
+(@PATH, 42, 1975.02, 253.234, 67.4879, 0),
+(@PATH, 43, 1987.19, 267.878, 67.0954, 0),
+(@PATH, 44, 2001.88, 284.088, 66.153, 0),
+(@PATH, 45, 2011.98, 301.219, 66.0991, 0);
+
+-- Group of 3 walking on Path From Southshore
+DELETE FROM `creature_formations` WHERE `leaderGUID`=40161;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(40161, 40161, 0, 0, 2, 0, 0),
+(40161, 48010, 3, 60, 2, 0, 0),
+(40161, 48011, 3, 300, 2, 0, 0);
+
+SET @NPC := 40161;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2033.7, 1037.71, 27.2622, 0),
+(@PATH, 2, 2052.69, 1027.51, 29.9964, 0),
+(@PATH, 3, 2064.05, 1024.49, 31.3459, 0),
+(@PATH, 4, 2081.15, 1024.77, 32.6441, 0),
+(@PATH, 5, 2094.54, 1028.74, 32.789, 0),
+(@PATH, 6, 2111.75, 1036.15, 34.8223, 0),
+(@PATH, 7, 2127.78, 1039.11, 37.3397, 0),
+(@PATH, 8, 2142.51, 1040.35, 39.4863, 0),
+(@PATH, 9, 2151.24, 1038.85, 40.903, 0),
+(@PATH, 10, 2163.97, 1033.92, 43.0773, 0),
+(@PATH, 11, 2179.02, 1029.86, 45.5233, 0),
+(@PATH, 12, 2193.08, 1024.2, 48.0107, 0),
+(@PATH, 13, 2209.97, 1019.79, 50.8105, 0),
+(@PATH, 14, 2232.14, 1015.33, 53.6278, 0),
+(@PATH, 15, 2236.86, 1000.05, 54.3589, 0),
+(@PATH, 16, 2239.94, 983.671, 54.5024, 0),
+(@PATH, 17, 2243.15, 967.012, 54.4995, 0),
+(@PATH, 18, 2250.3, 950.466, 54.4995, 0),
+(@PATH, 19, 2257.66, 929.562, 54.5, 0),
+(@PATH, 20, 2266.9, 907.928, 54.5, 0),
+(@PATH, 21, 2272.49, 895.354, 54.5, 0),
+(@PATH, 22, 2277.79, 879.701, 54.5, 0),
+(@PATH, 23, 2283.3, 862.612, 54.5, 0),
+(@PATH, 24, 2286.78, 846.443, 54.5038, 0),
+(@PATH, 25, 2287.27, 836.662, 54.5816, 0),
+(@PATH, 26, 2285.96, 818.884, 54.5465, 0),
+(@PATH, 27, 2300.59, 826.601, 54.2136, 0),
+(@PATH, 28, 2315.28, 833.688, 54.0844, 0),
+(@PATH, 29, 2329.23, 838.29, 53.7169, 0),
+(@PATH, 30, 2338.8, 843.829, 53.9952, 0),
+(@PATH, 31, 2360.41, 850.112, 55.0492, 0),
+(@PATH, 32, 2374.82, 854.797, 56.1393, 0),
+(@PATH, 33, 2389.13, 859.729, 56.593, 0),
+(@PATH, 34, 2406.24, 863.134, 57.4308, 0),
+(@PATH, 35, 2425.77, 870.367, 59.3746, 0),
+(@PATH, 36, 2440.46, 874.494, 60.7434, 0),
+(@PATH, 37, 2455.4, 877.09, 61.6139, 0),
+(@PATH, 38, 2468.96, 879.393, 62.7986, 0),
+(@PATH, 39, 2481.63, 882.154, 63.3108, 0),
+(@PATH, 40, 2500.23, 883.53, 63.8125, 0),
+(@PATH, 41, 2524.92, 884.253, 64.5644, 0),
+(@PATH, 42, 2549.01, 885.228, 65.2615, 0),
+(@PATH, 43, 2570.57, 885.702, 66.6194, 0),
+(@PATH, 44, 2590.25, 883.441, 68.0443, 0),
+(@PATH, 45, 2609.47, 883.434, 68.4157, 0),
+(@PATH, 46, 2627.08, 883.115, 68.7522, 0),
+(@PATH, 47, 2638.72, 884.668, 69.4879, 0),
+(@PATH, 48, 2647.3, 886.344, 69.9081, 0),
+(@PATH, 49, 2648.6, 864.03, 66.5179, 0),
+(@PATH, 50, 2644.51, 848.334, 63.7446, 0),
+(@PATH, 51, 2644.42, 832.861, 61.2474, 0),
+(@PATH, 52, 2650, 812.135, 59.5327, 0),
+(@PATH, 53, 2648.28, 798.034, 58.7606, 0),
+(@PATH, 54, 2641, 787.92, 57.6733, 0),
+(@PATH, 55, 2626.84, 778.887, 57.2837, 0),
+(@PATH, 56, 2617.82, 770.64, 56.741, 0),
+(@PATH, 57, 2612.9, 757.971, 56.3436, 0),
+(@PATH, 58, 2612.32, 742.239, 56.0196, 0),
+(@PATH, 59, 2618.59, 729.8, 55.5448, 0),
+(@PATH, 60, 2631.64, 717.81, 56.124, 0),
+(@PATH, 61, 2637.24, 709.656, 56.0667, 0),
+(@PATH, 62, 2640.55, 701.856, 55.9947, 0),
+(@PATH, 63, 2637.22, 712.487, 56.1679, 0),
+(@PATH, 64, 2623.09, 726.894, 55.695, 0),
+(@PATH, 65, 2615.24, 734.875, 55.5676, 0),
+(@PATH, 66, 2612.66, 743.85, 56.0761, 0),
+(@PATH, 67, 2612.93, 755.628, 56.358, 0),
+(@PATH, 68, 2616.75, 766.374, 56.679, 0),
+(@PATH, 69, 2621.31, 773.14, 57.0131, 0),
+(@PATH, 70, 2630.75, 781.124, 57.4799, 0),
+(@PATH, 71, 2640.96, 787.68, 57.6649, 0),
+(@PATH, 72, 2650.15, 800.171, 58.9708, 0),
+(@PATH, 73, 2650.52, 811.561, 59.5219, 0),
+(@PATH, 74, 2645.37, 829.821, 60.8724, 0),
+(@PATH, 75, 2643.37, 842.616, 62.7975, 0),
+(@PATH, 76, 2644.93, 852.378, 64.4211, 0),
+(@PATH, 77, 2649.51, 864.861, 66.7019, 0),
+(@PATH, 78, 2648.1, 877.58, 68.9693, 0),
+(@PATH, 79, 2644.34, 884.823, 69.6378, 0),
+(@PATH, 80, 2635.53, 884.284, 69.2843, 0),
+(@PATH, 81, 2620.1, 883.128, 68.5394, 0),
+(@PATH, 82, 2595.87, 882.61, 67.9833, 0),
+(@PATH, 83, 2574.96, 885.401, 67.11, 0),
+(@PATH, 84, 2547.6, 885.501, 65.1863, 0),
+(@PATH, 85, 2517.31, 884.012, 64.3204, 0),
+(@PATH, 86, 2487.24, 883.374, 63.4703, 0),
+(@PATH, 87, 2467.93, 880.227, 62.7723, 0),
+(@PATH, 88, 2446.76, 875.248, 61.0426, 0),
+(@PATH, 89, 2431.02, 873.251, 60.0043, 0),
+(@PATH, 90, 2411.9, 865.704, 57.8424, 0),
+(@PATH, 91, 2403.27, 862.833, 57.1985, 0),
+(@PATH, 92, 2385.71, 860.395, 56.5602, 0),
+(@PATH, 93, 2359.36, 850.036, 54.9632, 0),
+(@PATH, 94, 2335.95, 842.985, 53.888, 0),
+(@PATH, 95, 2311.06, 831.342, 54.1764, 0),
+(@PATH, 96, 2298.28, 825.996, 54.2442, 0),
+(@PATH, 97, 2284.59, 818.734, 54.5651, 0),
+(@PATH, 98, 2286.06, 833.548, 54.6597, 0),
+(@PATH, 99, 2284.14, 854.313, 54.4979, 0),
+(@PATH, 100, 2280.29, 869.203, 54.4995, 0),
+(@PATH, 101, 2271, 892.06, 54.4995, 0),
+(@PATH, 102, 2259.09, 921.511, 54.501, 0),
+(@PATH, 103, 2249.62, 946.579, 54.5057, 0),
+(@PATH, 104, 2243.4, 964.173, 54.5007, 0),
+(@PATH, 105, 2235.9, 989.626, 54.5012, 0),
+(@PATH, 106, 2232.97, 1005.62, 54.1029, 0),
+(@PATH, 107, 2227.72, 1015.88, 53.4782, 0),
+(@PATH, 108, 2211.84, 1020.49, 51.1169, 0),
+(@PATH, 109, 2192.95, 1024.61, 47.9657, 0),
+(@PATH, 110, 2172.81, 1032.27, 44.4531, 0),
+(@PATH, 111, 2153.53, 1037.24, 41.3712, 0),
+(@PATH, 112, 2140.79, 1040.89, 39.1775, 0),
+(@PATH, 113, 2123.12, 1039.6, 36.6713, 0),
+(@PATH, 114, 2103.49, 1035.02, 33.4594, 0),
+(@PATH, 115, 2086.92, 1026.77, 32.6743, 0),
+(@PATH, 116, 2072.26, 1023.99, 31.9935, 0),
+(@PATH, 117, 2056.05, 1025.72, 30.5415, 0),
+(@PATH, 118, 2040.42, 1032.48, 27.9721, 0),
+(@PATH, 119, 2027.22, 1039.55, 26.6217, 0),
+(@PATH, 120, 2009.61, 1041, 25.8193, 0),
+(@PATH, 121, 1994.01, 1036.6, 25.2784, 0),
+(@PATH, 122, 1978.52, 1028.8, 24.9676, 0),
+(@PATH, 123, 1966.82, 1030.89, 24.0734, 0),
+(@PATH, 124, 1958.48, 1036.2, 22.866, 0),
+(@PATH, 125, 1947.24, 1048.57, 20.7007, 0),
+(@PATH, 126, 1937.04, 1052.57, 20.1663, 0),
+(@PATH, 127, 1912.11, 1051.93, 18.6749, 0),
+(@PATH, 128, 1887.93, 1055.78, 18.1049, 0),
+(@PATH, 129, 1877.56, 1060.81, 17.4922, 0),
+(@PATH, 130, 1861.06, 1069.78, 15.7649, 0),
+(@PATH, 131, 1846.73, 1077.79, 13.6887, 0),
+(@PATH, 132, 1833.61, 1077.49, 11.9939, 0),
+(@PATH, 133, 1817.89, 1071.35, 10.6397, 0),
+(@PATH, 134, 1792.63, 1059.22, 7.83287, 0),
+(@PATH, 135, 1774.94, 1059.42, 6.82387, 0),
+(@PATH, 136, 1795.92, 1060.08, 8.12069, 0),
+(@PATH, 137, 1808.4, 1064.97, 9.29659, 0),
+(@PATH, 138, 1826.46, 1074.14, 11.2145, 0),
+(@PATH, 139, 1837.32, 1077.6, 12.5392, 0),
+(@PATH, 140, 1847.23, 1077.42, 13.785, 0),
+(@PATH, 141, 1858.66, 1071.86, 15.5919, 0),
+(@PATH, 142, 1872.94, 1061.59, 16.8176, 0),
+(@PATH, 143, 1889.64, 1056.42, 18.0499, 0),
+(@PATH, 144, 1900.68, 1053.04, 17.9079, 0),
+(@PATH, 145, 1926.7, 1051.99, 19.5382, 0),
+(@PATH, 146, 1940.56, 1051.1, 20.25, 0),
+(@PATH, 147, 1954.66, 1042.69, 21.7026, 0),
+(@PATH, 148, 1966.41, 1032.81, 23.8429, 0),
+(@PATH, 149, 1978.57, 1029.18, 24.9264, 0),
+(@PATH, 150, 1984.57, 1030.46, 25.3086, 0),
+(@PATH, 151, 2003.85, 1040.57, 25.4607, 0);
+
+-- Group of 3 NPC pathing main Path between Southshore and Tarren Mill
+DELETE FROM `creature_formations` WHERE `leaderGUID`=31931;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(31931, 31931, 0, 0, 2, 0, 0),
+(31931, 47895, 3, 300, 2, 0, 0),
+(31931, 47896, 3, 60, 2, 0, 0);
+
+SET @NPC := 31931;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2297.26, 826.454, 54.2536, 0),
+(@PATH, 2, 2318.02, 835.456, 53.9879, 0),
+(@PATH, 3, 2341.06, 844.537, 54.0672, 0),
+(@PATH, 4, 2368.06, 853.36, 55.6975, 0),
+(@PATH, 5, 2388.34, 859.967, 56.5967, 0),
+(@PATH, 6, 2407.29, 863.278, 57.523, 0),
+(@PATH, 7, 2429.46, 871.776, 59.8363, 0),
+(@PATH, 8, 2451.91, 876.067, 61.3264, 0),
+(@PATH, 9, 2474.39, 881.111, 63.0555, 0),
+(@PATH, 10, 2501.4, 883.295, 63.8419, 0),
+(@PATH, 11, 2526.21, 885.033, 64.6203, 0),
+(@PATH, 12, 2551.5, 885.4, 65.2762, 0),
+(@PATH, 13, 2570.97, 885.675, 66.6719, 0),
+(@PATH, 14, 2591.48, 882.584, 68.0358, 0),
+(@PATH, 15, 2628.4, 884.012, 68.849, 0),
+(@PATH, 16, 2658.91, 888.509, 71.2081, 0),
+(@PATH, 17, 2672.56, 890.768, 72.7702, 0),
+(@PATH, 18, 2693.86, 885.752, 74.1806, 0),
+(@PATH, 19, 2713.38, 884.501, 76.1029, 0),
+(@PATH, 20, 2732.82, 888.404, 78.4829, 0),
+(@PATH, 21, 2755.95, 883.583, 81.4612, 0),
+(@PATH, 22, 2785.64, 885.325, 86.028, 0),
+(@PATH, 23, 2804.28, 891.622, 89.6307, 0),
+(@PATH, 24, 2814.42, 899.85, 91.8807, 0),
+(@PATH, 25, 2830.66, 915.238, 96.5334, 0),
+(@PATH, 26, 2866.3, 920.68, 105.739, 0),
+(@PATH, 27, 2899.02, 946.215, 117.103, 0),
+(@PATH, 28, 2941.42, 947.916, 130.207, 0),
+(@PATH, 29, 2952.49, 953.108, 133.123, 0),
+(@PATH, 30, 2933.55, 946.743, 127.665, 0),
+(@PATH, 31, 2912.45, 947.439, 120.768, 0),
+(@PATH, 32, 2894.96, 944.572, 115.928, 0),
+(@PATH, 33, 2887.02, 939.921, 113.319, 0),
+(@PATH, 34, 2870.86, 923.593, 107.219, 0),
+(@PATH, 35, 2860.04, 919.649, 103.829, 0),
+(@PATH, 36, 2832.34, 917.115, 97.0985, 0),
+(@PATH, 37, 2823.7, 912.33, 94.8206, 0),
+(@PATH, 38, 2811.53, 898.344, 91.292, 0),
+(@PATH, 39, 2798.25, 888.481, 88.2803, 0),
+(@PATH, 40, 2786.07, 884.969, 86.0852, 0),
+(@PATH, 41, 2768.53, 883.895, 83.3232, 0),
+(@PATH, 42, 2750.42, 885.691, 80.8465, 0),
+(@PATH, 43, 2731.02, 888.331, 78.2216, 0),
+(@PATH, 44, 2708.53, 885.886, 75.4766, 0),
+(@PATH, 45, 2692.26, 885.711, 74.0608, 0),
+(@PATH, 46, 2674.56, 891.05, 72.9436, 0),
+(@PATH, 47, 2656.87, 890.577, 71.0586, 0),
+(@PATH, 48, 2643.22, 886.547, 69.736, 0),
+(@PATH, 49, 2620.6, 882.848, 68.5394, 0),
+(@PATH, 50, 2601.61, 882.172, 68.1294, 0),
+(@PATH, 51, 2582.66, 883.452, 67.743, 0),
+(@PATH, 52, 2569.63, 886.578, 66.4967, 0),
+(@PATH, 53, 2539.69, 885.352, 64.7605, 0),
+(@PATH, 54, 2518.36, 884.463, 64.3804, 0),
+(@PATH, 55, 2501.75, 884.356, 63.7759, 0),
+(@PATH, 56, 2476.52, 882.351, 63.1364, 0),
+(@PATH, 57, 2457.38, 877.412, 61.8321, 0),
+(@PATH, 58, 2437.14, 874.718, 60.5453, 0),
+(@PATH, 59, 2416.18, 867.191, 58.1515, 0),
+(@PATH, 60, 2405.78, 863.337, 57.3958, 0),
+(@PATH, 61, 2385.29, 859.648, 56.5073, 0),
+(@PATH, 62, 2366.22, 853.921, 55.574, 0),
+(@PATH, 63, 2340.44, 844.064, 54.0407, 0),
+(@PATH, 64, 2321.49, 836.288, 53.8379, 0),
+(@PATH, 65, 2304.05, 828.219, 54.167, 0),
+(@PATH, 66, 2284.63, 819.081, 54.5629, 0),
+(@PATH, 67, 2276.49, 806.015, 54.5062, 0),
+(@PATH, 68, 2259.45, 782.432, 53.9581, 0),
+(@PATH, 69, 2248.1, 764.237, 52.6681, 0),
+(@PATH, 70, 2227.61, 742.088, 47.3814, 0),
+(@PATH, 71, 2211.48, 719.391, 41.8384, 0),
+(@PATH, 72, 2196.17, 701.104, 37.2442, 0),
+(@PATH, 73, 2186.72, 682.881, 34.477, 0),
+(@PATH, 74, 2183.15, 671.171, 34.0323, 0),
+(@PATH, 75, 2191.46, 692.237, 35.6717, 0),
+(@PATH, 76, 2204.3, 712.019, 39.6665, 0),
+(@PATH, 77, 2223.15, 734.204, 45.6636, 0),
+(@PATH, 78, 2238.43, 754.221, 50.8206, 0),
+(@PATH, 79, 2252.94, 770.293, 53.2999, 0),
+(@PATH, 80, 2271.29, 798.227, 54.5908, 0),
+(@PATH, 81, 2284.63, 817.792, 54.572, 0),
+(@PATH, 82, 2286.83, 831.371, 54.5761, 0),
+(@PATH, 83, 2285.96, 848.028, 54.5205, 0),
+(@PATH, 84, 2283.72, 858.862, 54.4995, 0),
+(@PATH, 85, 2277.61, 875.464, 54.4994, 0),
+(@PATH, 86, 2266.79, 902.231, 54.4994, 0),
+(@PATH, 87, 2258.17, 922.595, 54.5014, 0),
+(@PATH, 88, 2254.14, 937.694, 54.5014, 0),
+(@PATH, 89, 2247.62, 954.305, 54.4998, 0),
+(@PATH, 90, 2241.64, 970.8, 54.4998, 0),
+(@PATH, 91, 2236.29, 990.011, 54.5018, 0),
+(@PATH, 92, 2230.51, 1015.88, 53.58, 0),
+(@PATH, 93, 2226.99, 1040.78, 52.9566, 0),
+(@PATH, 94, 2225.38, 1066.21, 50.8387, 0),
+(@PATH, 95, 2224.57, 1092.67, 47.9604, 0),
+(@PATH, 96, 2221.17, 1118.32, 47.3289, 0),
+(@PATH, 97, 2215.23, 1142.62, 47.3363, 0),
+(@PATH, 98, 2206.52, 1160.95, 47.3294, 0),
+(@PATH, 99, 2191.01, 1180.19, 47.3334, 0),
+(@PATH, 100, 2176.06, 1200.97, 47.3576, 0),
+(@PATH, 101, 2153.58, 1232.91, 47.3083, 0),
+(@PATH, 102, 2137.4, 1265.68, 47.3415, 0),
+(@PATH, 103, 2117.78, 1296.4, 47.2391, 0),
+(@PATH, 104, 2105.55, 1331, 47.311, 0),
+(@PATH, 105, 2099.06, 1343.26, 47.3169, 0),
+(@PATH, 106, 2106.72, 1327.73, 47.2684, 0),
+(@PATH, 107, 2118.71, 1298.89, 47.2623, 0),
+(@PATH, 108, 2129.37, 1279.65, 47.3572, 0),
+(@PATH, 109, 2142, 1260.53, 47.3312, 0),
+(@PATH, 110, 2151.32, 1240.71, 47.2761, 0),
+(@PATH, 111, 2163.63, 1218.81, 47.3292, 0),
+(@PATH, 112, 2181.68, 1197.19, 47.3568, 0),
+(@PATH, 113, 2201.05, 1172.65, 47.3118, 0),
+(@PATH, 114, 2211.89, 1155.51, 47.3104, 0),
+(@PATH, 115, 2218.39, 1140.43, 47.3378, 0),
+(@PATH, 116, 2225.45, 1110.72, 47.206, 0),
+(@PATH, 117, 2226.69, 1088.6, 48.2767, 0),
+(@PATH, 118, 2227.51, 1061.13, 51.162, 0),
+(@PATH, 119, 2229.3, 1040.74, 52.9542, 0),
+(@PATH, 120, 2232.73, 1016.29, 53.6401, 0),
+(@PATH, 121, 2238.52, 992.95, 54.498, 0),
+(@PATH, 122, 2244.92, 960.982, 54.501, 0),
+(@PATH, 123, 2256.49, 934.401, 54.5, 0),
+(@PATH, 124, 2272.51, 894.714, 54.5, 0),
+(@PATH, 125, 2279.98, 869.234, 54.5, 0),
+(@PATH, 126, 2286.45, 846.302, 54.5178, 0),
+(@PATH, 127, 2287.17, 829.612, 54.5198, 0),
+(@PATH, 128, 2285.48, 818.834, 54.5455, 0);
+
+-- Group of 3 NPC pathing main Path between Tarren Mill and Southshore
+DELETE FROM `creature_formations` WHERE `leaderGUID`=38051;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(38051, 38051, 0, 0, 2, 0, 0),
+(38051, 48006, 3, 60, 2, 0, 0),
+(38051, 48007, 3, 300, 2, 0, 0);
+
+SET @NPC := 38051;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2405.29, 863.545, 57.358, 0),
+(@PATH, 2, 2389.6, 860.732, 56.6579, 0),
+(@PATH, 3, 2370.87, 854.003, 55.8788, 0),
+(@PATH, 4, 2342.21, 845.899, 54.1098, 0),
+(@PATH, 5, 2322.7, 836.199, 53.8074, 0),
+(@PATH, 6, 2302.11, 828.377, 54.1732, 0),
+(@PATH, 7, 2285.29, 818.678, 54.5502, 0),
+(@PATH, 8, 2286.14, 836.791, 54.6453, 0),
+(@PATH, 9, 2284.46, 852.418, 54.509, 0),
+(@PATH, 10, 2279.3, 869.348, 54.498, 0),
+(@PATH, 11, 2269.94, 893.051, 54.5021, 0),
+(@PATH, 12, 2263.07, 909.73, 54.5019, 0),
+(@PATH, 13, 2255.3, 934.26, 54.501, 0),
+(@PATH, 14, 2247.8, 950.238, 54.4582, 0),
+(@PATH, 15, 2243.19, 964.782, 54.4998, 0),
+(@PATH, 16, 2237.24, 983.533, 54.5095, 0),
+(@PATH, 17, 2233.59, 1000.86, 54.3187, 0),
+(@PATH, 18, 2229.28, 1014.61, 53.5769, 0),
+(@PATH, 19, 2221.45, 1018.46, 52.9309, 0),
+(@PATH, 20, 2203, 1022.28, 49.5684, 0),
+(@PATH, 21, 2180.63, 1029.22, 45.8132, 0),
+(@PATH, 22, 2163.91, 1033.35, 43.1132, 0),
+(@PATH, 23, 2147.39, 1039.4, 40.2942, 0),
+(@PATH, 24, 2130.86, 1040.3, 37.7083, 0),
+(@PATH, 25, 2114.52, 1037.05, 35.2203, 0),
+(@PATH, 26, 2099.97, 1032.09, 33.0175, 0),
+(@PATH, 27, 2085.48, 1024.85, 32.7897, 0),
+(@PATH, 28, 2067.1, 1023.42, 31.5893, 0),
+(@PATH, 29, 2053.53, 1026.31, 30.1988, 0),
+(@PATH, 30, 2030.91, 1038.02, 27.0364, 0),
+(@PATH, 31, 2017.57, 1040.71, 25.9681, 0),
+(@PATH, 32, 2004.12, 1039.63, 25.5061, 0),
+(@PATH, 33, 1993.23, 1036.26, 25.2964, 0),
+(@PATH, 34, 1980, 1030.16, 25.0028, 0),
+(@PATH, 35, 1971.42, 1030.94, 24.2482, 0),
+(@PATH, 36, 1959.98, 1036.36, 22.9669, 0),
+(@PATH, 37, 1948.68, 1047.78, 20.8565, 0),
+(@PATH, 38, 1937.34, 1052.4, 20.1837, 0),
+(@PATH, 39, 1925.76, 1053.7, 19.4854, 0),
+(@PATH, 40, 1905.6, 1053.15, 18.1491, 0),
+(@PATH, 41, 1888.62, 1055.3, 18.0517, 0),
+(@PATH, 42, 1868.76, 1064.87, 16.3555, 0),
+(@PATH, 43, 1846.84, 1077.65, 13.7145, 0),
+(@PATH, 44, 1835.61, 1078.54, 12.2458, 0),
+(@PATH, 45, 1817.8, 1071.93, 10.6522, 0),
+(@PATH, 46, 1796.05, 1060.56, 8.13385, 0),
+(@PATH, 47, 1789.08, 1059.15, 7.65879, 0),
+(@PATH, 48, 1774.32, 1059.31, 6.80622, 0),
+(@PATH, 49, 1788.97, 1058.6, 7.63011, 0),
+(@PATH, 50, 1801.99, 1062.31, 8.54349, 0),
+(@PATH, 51, 1823.33, 1073.43, 11.1419, 0),
+(@PATH, 52, 1837.23, 1076.53, 12.5762, 0),
+(@PATH, 53, 1851.52, 1075.54, 14.5757, 0),
+(@PATH, 54, 1862.81, 1069.95, 15.9675, 0),
+(@PATH, 55, 1877.71, 1059.18, 17.4732, 0),
+(@PATH, 56, 1888.84, 1054.67, 18.0092, 0),
+(@PATH, 57, 1904.79, 1052.51, 18.12, 0),
+(@PATH, 58, 1939.39, 1050.96, 20.2504, 0),
+(@PATH, 59, 1951.26, 1045.59, 21.1385, 0),
+(@PATH, 60, 1965.78, 1032.34, 23.8575, 0),
+(@PATH, 61, 1986.59, 1028.48, 25.645, 0),
+(@PATH, 62, 2002.26, 1037.34, 25.438, 0),
+(@PATH, 63, 2014.81, 1040.37, 25.9989, 0),
+(@PATH, 64, 2033.74, 1037.58, 27.2585, 0),
+(@PATH, 65, 2050.87, 1029.07, 29.6277, 0),
+(@PATH, 66, 2063.27, 1024.33, 31.3215, 0),
+(@PATH, 67, 2072.66, 1023.3, 32.046, 0),
+(@PATH, 68, 2086.48, 1026.12, 32.7105, 0),
+(@PATH, 69, 2106.57, 1033.64, 34.0726, 0),
+(@PATH, 70, 2121.53, 1039.27, 36.4285, 0),
+(@PATH, 71, 2141.18, 1040.22, 39.2886, 0),
+(@PATH, 72, 2149.33, 1039.93, 40.538, 0),
+(@PATH, 73, 2166.01, 1033.61, 43.3866, 0),
+(@PATH, 74, 2192.56, 1024.79, 47.8952, 0),
+(@PATH, 75, 2223.67, 1018.16, 53.1731, 0),
+(@PATH, 76, 2232.56, 1009.46, 53.865, 0),
+(@PATH, 77, 2240.66, 982.041, 54.5019, 0),
+(@PATH, 78, 2247.14, 957.74, 54.5019, 0),
+(@PATH, 79, 2254.1, 940.466, 54.4827, 0),
+(@PATH, 80, 2264.73, 913.689, 54.5, 0),
+(@PATH, 81, 2275.35, 886.915, 54.5, 0),
+(@PATH, 82, 2282.61, 864.421, 54.5, 0),
+(@PATH, 83, 2286.83, 848.53, 54.5075, 0),
+(@PATH, 84, 2286.98, 836.984, 54.5962, 0),
+(@PATH, 85, 2285.43, 818.579, 54.5534, 0),
+(@PATH, 86, 2299.92, 826.916, 54.2152, 0),
+(@PATH, 87, 2323.04, 836.71, 53.7918, 0),
+(@PATH, 88, 2342.12, 844.995, 54.1024, 0),
+(@PATH, 89, 2369.56, 854.127, 55.7927, 0),
+(@PATH, 90, 2401.18, 863.514, 57.0901, 0),
+(@PATH, 91, 2413.96, 866.099, 57.992, 0),
+(@PATH, 92, 2460.26, 878.534, 62.1424, 0),
+(@PATH, 93, 2477.08, 882.264, 63.1521, 0),
+(@PATH, 94, 2496.16, 884.711, 63.766, 0),
+(@PATH, 95, 2526.3, 884.571, 64.6078, 0),
+(@PATH, 96, 2549.14, 885.522, 65.2781, 0),
+(@PATH, 97, 2570.91, 884.899, 66.6748, 0),
+(@PATH, 98, 2593.72, 883.698, 68.0105, 0),
+(@PATH, 99, 2611.25, 881.574, 68.365, 0),
+(@PATH, 100, 2623.99, 883.132, 68.6387, 0),
+(@PATH, 101, 2647.38, 885.993, 69.8835, 0),
+(@PATH, 102, 2648.69, 863.374, 66.4059, 0),
+(@PATH, 103, 2643.39, 846.464, 63.4591, 0),
+(@PATH, 104, 2645.2, 828.609, 60.7574, 0),
+(@PATH, 105, 2650.3, 807.324, 59.3795, 0),
+(@PATH, 106, 2647.34, 796.666, 58.6261, 0),
+(@PATH, 107, 2636.73, 784.647, 57.6502, 0),
+(@PATH, 108, 2622.12, 774.868, 57.0314, 0),
+(@PATH, 109, 2614.77, 761.206, 56.4657, 0),
+(@PATH, 110, 2613.46, 745.3, 56.1324, 0),
+(@PATH, 111, 2617.36, 732.602, 55.5625, 0),
+(@PATH, 112, 2626.33, 723.16, 55.8659, 0),
+(@PATH, 113, 2634.97, 714.328, 56.1839, 0),
+(@PATH, 114, 2640.5, 701.619, 55.9892, 0),
+(@PATH, 115, 2634.83, 714.57, 56.1825, 0),
+(@PATH, 116, 2616.87, 732.558, 55.5504, 0),
+(@PATH, 117, 2613.24, 745.347, 56.1345, 0),
+(@PATH, 118, 2615.79, 763.247, 56.5672, 0),
+(@PATH, 119, 2621.52, 774.199, 57.0032, 0),
+(@PATH, 120, 2635.18, 782.875, 57.5838, 0),
+(@PATH, 121, 2649.14, 799.158, 58.8695, 0),
+(@PATH, 122, 2651.07, 809.314, 59.4608, 0),
+(@PATH, 123, 2644.77, 833.17, 61.2945, 0),
+(@PATH, 124, 2645.05, 850.54, 64.1148, 0),
+(@PATH, 125, 2648.81, 862.532, 66.2628, 0),
+(@PATH, 126, 2648.37, 877.794, 69.0155, 0),
+(@PATH, 127, 2644.96, 885.466, 69.7138, 0),
+(@PATH, 128, 2630.96, 883.18, 68.9351, 0),
+(@PATH, 129, 2610.28, 881.989, 68.3692, 0),
+(@PATH, 130, 2585.17, 884.121, 67.9368, 0),
+(@PATH, 131, 2552.44, 885.579, 65.2571, 0),
+(@PATH, 132, 2531.61, 884.104, 64.6916, 0),
+(@PATH, 133, 2504.17, 883.352, 63.879, 0),
+(@PATH, 134, 2485.41, 883.278, 63.4378, 0),
+(@PATH, 135, 2463.75, 879.443, 62.4912, 0),
+(@PATH, 136, 2445.75, 875.207, 60.9997, 0),
+(@PATH, 137, 2429.46, 871.952, 59.8412, 0);
+
+-- Group of 3 NPC pathing main Path between Tarren Mill and Southshore
+DELETE FROM `creature_formations` WHERE `leaderGUID`=38497;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(38497, 38497, 0, 0, 2, 0, 0),
+(38497, 48008, 3, 60, 2, 0, 0),
+(38497, 48009, 3, 300, 2, 0, 0);
+
+SET @NPC := 38497;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2623.64, 882.626, 68.6133, 0),
+(@PATH, 2, 2600.13, 882.822, 68.0922, 0),
+(@PATH, 3, 2580.55, 883.611, 67.6017, 0),
+(@PATH, 4, 2567.45, 885.735, 66.2376, 0),
+(@PATH, 5, 2532.34, 884.413, 64.6915, 0),
+(@PATH, 6, 2504.99, 883.813, 63.8629, 0),
+(@PATH, 7, 2484.41, 882.641, 63.4126, 0),
+(@PATH, 8, 2464.69, 879.085, 62.5522, 0),
+(@PATH, 9, 2438.99, 875.143, 60.6649, 0),
+(@PATH, 10, 2412.51, 866.219, 57.8843, 0),
+(@PATH, 11, 2400.56, 862.671, 57.0296, 0),
+(@PATH, 12, 2381.6, 858.764, 56.4373, 0),
+(@PATH, 13, 2361.56, 851.541, 55.1672, 0),
+(@PATH, 14, 2342.78, 845.588, 54.1166, 0),
+(@PATH, 15, 2324.92, 837.409, 53.7317, 0),
+(@PATH, 16, 2305.99, 829.468, 54.1501, 0),
+(@PATH, 17, 2296.63, 825.295, 54.2967, 0),
+(@PATH, 18, 2282.82, 816.84, 54.5995, 0),
+(@PATH, 19, 2285.59, 830.712, 54.6387, 0),
+(@PATH, 20, 2285.34, 850.387, 54.5222, 0),
+(@PATH, 21, 2279.74, 868.564, 54.4983, 0),
+(@PATH, 22, 2271.64, 888.568, 54.4999, 0),
+(@PATH, 23, 2262.19, 911.921, 54.5229, 0),
+(@PATH, 24, 2253.29, 935.335, 54.5011, 0),
+(@PATH, 25, 2246.47, 955.744, 54.4992, 0),
+(@PATH, 26, 2240.17, 975.643, 54.4938, 0),
+(@PATH, 27, 2236.17, 997.163, 54.4527, 0),
+(@PATH, 28, 2231.74, 1016.9, 53.6181, 0),
+(@PATH, 29, 2210.78, 1020.64, 50.9163, 0),
+(@PATH, 30, 2189.62, 1026.27, 47.3583, 0),
+(@PATH, 31, 2155.27, 1036.57, 41.6736, 0),
+(@PATH, 32, 2137.13, 1040.63, 38.6119, 0),
+(@PATH, 33, 2117.75, 1037.24, 35.7503, 0),
+(@PATH, 34, 2099.38, 1030.87, 33.0353, 0),
+(@PATH, 35, 2076.36, 1024.7, 32.3428, 0),
+(@PATH, 36, 2058.17, 1025.24, 30.8303, 0),
+(@PATH, 37, 2040.36, 1033.63, 27.92, 0),
+(@PATH, 38, 2022.57, 1039.79, 26.231, 0),
+(@PATH, 39, 2005.44, 1039.58, 25.6047, 0),
+(@PATH, 40, 1990.56, 1034.27, 25.3473, 0),
+(@PATH, 41, 1978.21, 1029.65, 24.8705, 0),
+(@PATH, 42, 1967.42, 1032.02, 23.9704, 0),
+(@PATH, 43, 1954.63, 1041.74, 21.7939, 0),
+(@PATH, 44, 1942.43, 1050.73, 20.3123, 0),
+(@PATH, 45, 1933.61, 1052.95, 20.0561, 0),
+(@PATH, 46, 1911.5, 1053.02, 18.556, 0),
+(@PATH, 47, 1890.89, 1055.17, 17.9183, 0),
+(@PATH, 48, 1873.91, 1063.11, 16.998, 0),
+(@PATH, 49, 1852.8, 1075.69, 14.7824, 0),
+(@PATH, 50, 1835.4, 1077.69, 12.2362, 0),
+(@PATH, 51, 1822.26, 1073.72, 11.1149, 0),
+(@PATH, 52, 1807.7, 1066.44, 9.26395, 0),
+(@PATH, 53, 1792.85, 1059.36, 7.84803, 0),
+(@PATH, 54, 1774.69, 1059.29, 6.81798, 0),
+(@PATH, 55, 1792.6, 1059.07, 7.8329, 0),
+(@PATH, 56, 1808.74, 1067.03, 9.4278, 0),
+(@PATH, 57, 1823.02, 1073.86, 11.1345, 0),
+(@PATH, 58, 1836.03, 1077.81, 12.3188, 0),
+(@PATH, 59, 1849.01, 1076.66, 14.1002, 0),
+(@PATH, 60, 1861.43, 1069.11, 15.7692, 0),
+(@PATH, 61, 1874.49, 1062.7, 17.0596, 0),
+(@PATH, 62, 1890.24, 1055.5, 17.9729, 0),
+(@PATH, 63, 1904.57, 1053.95, 18.0479, 0),
+(@PATH, 64, 1916.55, 1053.18, 18.9363, 0),
+(@PATH, 65, 1933.4, 1052.95, 20.0517, 0),
+(@PATH, 66, 1943.01, 1050.55, 20.3518, 0),
+(@PATH, 67, 1955.44, 1041.45, 21.9159, 0),
+(@PATH, 68, 1967.87, 1031.84, 24.0051, 0),
+(@PATH, 69, 1979.65, 1030.46, 24.9749, 0),
+(@PATH, 70, 1991.58, 1035.13, 25.3171, 0),
+(@PATH, 71, 2004.26, 1040.18, 25.5059, 0),
+(@PATH, 72, 2017.05, 1040.72, 25.9712, 0),
+(@PATH, 73, 2029.5, 1038.99, 26.9065, 0),
+(@PATH, 74, 2042.05, 1032.85, 28.1192, 0),
+(@PATH, 75, 2055.96, 1026.3, 30.4824, 0),
+(@PATH, 76, 2070.42, 1024.65, 31.8006, 0),
+(@PATH, 77, 2086.33, 1025.68, 32.7406, 0),
+(@PATH, 78, 2100.96, 1032, 33.1382, 0),
+(@PATH, 79, 2114.52, 1037.04, 35.2198, 0),
+(@PATH, 80, 2132.59, 1039.75, 37.9587, 0),
+(@PATH, 81, 2144.46, 1040.52, 39.7703, 0),
+(@PATH, 82, 2153.53, 1037.96, 41.3082, 0),
+(@PATH, 83, 2167.6, 1033.48, 43.6209, 0),
+(@PATH, 84, 2187.08, 1026.78, 46.943, 0),
+(@PATH, 85, 2204.22, 1021.93, 49.7543, 0),
+(@PATH, 86, 2223.61, 1017.27, 53.1783, 0),
+(@PATH, 87, 2232.01, 1015.26, 53.6222, 0),
+(@PATH, 88, 2236.23, 999.343, 54.3852, 0),
+(@PATH, 89, 2239.38, 984.686, 54.5012, 0),
+(@PATH, 90, 2242.49, 971.639, 54.5014, 0),
+(@PATH, 91, 2248.3, 955.438, 54.5014, 0),
+(@PATH, 92, 2254.99, 938.768, 54.4779, 0),
+(@PATH, 93, 2261.07, 922.135, 54.5, 0),
+(@PATH, 94, 2266.88, 905.883, 54.5, 0),
+(@PATH, 95, 2274.21, 888.239, 54.5, 0),
+(@PATH, 96, 2279.37, 874.616, 54.5, 0),
+(@PATH, 97, 2284.17, 858.54, 54.5, 0),
+(@PATH, 98, 2287.07, 842.492, 54.5179, 0),
+(@PATH, 99, 2285.06, 822.339, 54.5329, 0),
+(@PATH, 100, 2280.85, 810.904, 54.6746, 0),
+(@PATH, 101, 2271.04, 797.561, 54.6055, 0),
+(@PATH, 102, 2259.76, 781.45, 53.8876, 0),
+(@PATH, 103, 2248.5, 765.984, 52.8455, 0),
+(@PATH, 104, 2236.45, 751.637, 50.1543, 0),
+(@PATH, 105, 2225.2, 738.288, 46.4978, 0),
+(@PATH, 106, 2213.97, 724.141, 42.9242, 0),
+(@PATH, 107, 2202.25, 709.473, 39.0475, 0),
+(@PATH, 108, 2194.26, 696.874, 36.4775, 0),
+(@PATH, 109, 2186.81, 684.001, 34.5315, 0),
+(@PATH, 110, 2183.46, 671.279, 34.0336, 0),
+(@PATH, 111, 2187.66, 685.597, 34.7246, 0),
+(@PATH, 112, 2193.64, 696.274, 36.3443, 0),
+(@PATH, 113, 2201.04, 707.84, 38.69, 0),
+(@PATH, 114, 2211.41, 720.413, 41.9614, 0),
+(@PATH, 115, 2220.05, 732.154, 44.9148, 0),
+(@PATH, 116, 2231.68, 746.231, 48.6348, 0),
+(@PATH, 117, 2243.47, 759.741, 51.9549, 0),
+(@PATH, 118, 2255.85, 775.368, 53.5629, 0),
+(@PATH, 119, 2266.82, 791.228, 54.4124, 0),
+(@PATH, 120, 2279.62, 808.93, 54.6154, 0),
+(@PATH, 121, 2288.49, 820.299, 54.508, 0),
+(@PATH, 122, 2303.16, 828.045, 54.171, 0),
+(@PATH, 123, 2322.33, 836.623, 53.8113, 0),
+(@PATH, 124, 2338.3, 843.771, 53.9838, 0),
+(@PATH, 125, 2356.31, 849.242, 54.7057, 0),
+(@PATH, 126, 2372.63, 855.509, 56.0487, 0),
+(@PATH, 127, 2392.92, 860.918, 56.7245, 0),
+(@PATH, 128, 2403.8, 863.428, 57.2484, 0),
+(@PATH, 129, 2417.72, 868.716, 58.2846, 0),
+(@PATH, 130, 2431.94, 873.159, 60.0873, 0),
+(@PATH, 131, 2453.95, 877.012, 61.4676, 0),
+(@PATH, 132, 2471.19, 880.03, 62.9147, 0),
+(@PATH, 133, 2488.42, 883.049, 63.5039, 0),
+(@PATH, 134, 2513.13, 884.144, 64.1431, 0),
+(@PATH, 135, 2534.12, 884.568, 64.6657, 0),
+(@PATH, 136, 2555.08, 885.304, 65.2048, 0),
+(@PATH, 137, 2569.07, 885.554, 66.4459, 0),
+(@PATH, 138, 2582.07, 884.088, 67.696, 0),
+(@PATH, 139, 2593.98, 882.95, 68.0114, 0),
+(@PATH, 140, 2614.98, 882.582, 68.4484, 0),
+(@PATH, 141, 2625.81, 882.393, 68.6676, 0),
+(@PATH, 142, 2633.1, 883.922, 69.0972, 0),
+(@PATH, 143, 2646.96, 884.471, 69.7285, 0),
+(@PATH, 144, 2648.23, 865.67, 66.7963, 0),
+(@PATH, 145, 2644.19, 848.839, 63.8337, 0),
+(@PATH, 146, 2644.26, 834.261, 61.4547, 0),
+(@PATH, 147, 2650.22, 812.238, 59.5396, 0),
+(@PATH, 148, 2648.97, 801.635, 59.0204, 0),
+(@PATH, 149, 2640.9, 787.801, 57.6706, 0),
+(@PATH, 150, 2626.1, 777.72, 57.2633, 0),
+(@PATH, 151, 2616.67, 767.457, 56.6651, 0),
+(@PATH, 152, 2613.49, 757.029, 56.3742, 0),
+(@PATH, 153, 2613.37, 741.667, 55.9822, 0),
+(@PATH, 154, 2619.74, 729.303, 55.5678, 0),
+(@PATH, 155, 2630.88, 717.435, 56.0887, 0),
+(@PATH, 156, 2639.41, 707.385, 56.074, 0),
+(@PATH, 157, 2640.33, 701.769, 56.002, 0),
+(@PATH, 158, 2638, 711.757, 56.1583, 0),
+(@PATH, 159, 2627.47, 721.829, 55.9278, 0),
+(@PATH, 160, 2618, 732.662, 55.6043, 0),
+(@PATH, 161, 2612.4, 747.203, 56.2022, 0),
+(@PATH, 162, 2615.04, 762.187, 56.5118, 0),
+(@PATH, 163, 2619.29, 771.77, 56.8562, 0),
+(@PATH, 164, 2626.66, 778.108, 57.286, 0),
+(@PATH, 165, 2644.28, 790.759, 57.9907, 0),
+(@PATH, 166, 2649.74, 800.614, 58.9864, 0),
+(@PATH, 167, 2650.19, 813.604, 59.6128, 0),
+(@PATH, 168, 2647.7, 823.968, 60.3343, 0),
+(@PATH, 169, 2644.31, 836.22, 61.7544, 0),
+(@PATH, 170, 2644.69, 847.637, 63.6237, 0),
+(@PATH, 171, 2648.54, 860.659, 65.9248, 0),
+(@PATH, 172, 2646.93, 878.184, 69.0024, 0),
+(@PATH, 173, 2644.64, 885.239, 69.6836, 0);
+
+-- Aged Dalaran Wizard pathing main Path between Tarren Mill and Southshore
+DELETE FROM `creature_formations` WHERE `leaderGUID`=83476;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(83476, 83476, 0, 0, 2, 0, 0),
+(83476, 83477, 2, 270, 2, 0, 0);
+
+SET @NPC := 83476;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2484.44, 882.836, 63.4156, 0),
+(@PATH, 2, 2510.93, 884.306, 63.9832, 0),
+(@PATH, 3, 2539.44, 884.782, 64.7488, 0),
+(@PATH, 4, 2564.57, 885.359, 65.7858, 0),
+(@PATH, 5, 2580.22, 884.448, 67.5697, 0),
+(@PATH, 6, 2600.64, 882.524, 68.1024, 0),
+(@PATH, 7, 2618.57, 882.459, 68.4928, 0),
+(@PATH, 8, 2646.56, 885.349, 69.7791, 0),
+(@PATH, 9, 2647.94, 862.361, 66.1963, 0),
+(@PATH, 10, 2644.15, 843.683, 62.9245, 0),
+(@PATH, 11, 2645.15, 829.603, 60.8501, 0),
+(@PATH, 12, 2649.89, 809.554, 59.4495, 0),
+(@PATH, 13, 2647.55, 798.667, 58.7754, 0),
+(@PATH, 14, 2638.41, 786, 57.6675, 0),
+(@PATH, 15, 2625.34, 776.466, 57.2481, 0),
+(@PATH, 16, 2615.74, 765.931, 56.5869, 0),
+(@PATH, 17, 2611.94, 751.53, 56.3252, 0),
+(@PATH, 18, 2613.24, 738.202, 55.7307, 0),
+(@PATH, 19, 2621.66, 727.464, 55.6185, 0),
+(@PATH, 20, 2635.37, 713.483, 56.1676, 0),
+(@PATH, 21, 2640.86, 702.72, 56.0097, 0),
+(@PATH, 22, 2639.43, 692.111, 55.5087, 0),
+(@PATH, 23, 2633.71, 674.388, 54.4811, 0),
+(@PATH, 24, 2619.19, 672.633, 54.8655, 0),
+(@PATH, 25, 2624.72, 672.28, 54.4806, 300000),
+(@PATH, 26, 2634.5, 674.4, 54.4789, 0),
+(@PATH, 27, 2640.02, 686.749, 55.1281, 0),
+(@PATH, 28, 2641.53, 699.248, 55.8583, 0),
+(@PATH, 29, 2639.61, 708.263, 56.0874, 0),
+(@PATH, 30, 2630.65, 719.151, 56.0962, 0),
+(@PATH, 31, 2620.88, 728.317, 55.5883, 0),
+(@PATH, 32, 2614.01, 737.448, 55.7114, 0),
+(@PATH, 33, 2612.71, 746.896, 56.1872, 0),
+(@PATH, 34, 2614.34, 758.087, 56.4286, 0),
+(@PATH, 35, 2620.39, 771.216, 56.9779, 0),
+(@PATH, 36, 2630.91, 779.742, 57.4555, 0),
+(@PATH, 37, 2642.88, 791.11, 57.9629, 0),
+(@PATH, 38, 2650.38, 802.874, 59.1506, 0),
+(@PATH, 39, 2649.7, 812.675, 59.575, 0),
+(@PATH, 40, 2644.98, 829.942, 60.8814, 0),
+(@PATH, 41, 2644.41, 840.724, 62.4603, 0),
+(@PATH, 42, 2646.98, 855.456, 64.9715, 0),
+(@PATH, 43, 2648.87, 870.519, 67.7707, 0),
+(@PATH, 44, 2646.21, 884.709, 69.7036, 0),
+(@PATH, 45, 2631.29, 884.261, 69.0209, 0),
+(@PATH, 46, 2615.04, 883.348, 68.4797, 0),
+(@PATH, 47, 2597.47, 883.854, 68.0493, 0),
+(@PATH, 48, 2583.38, 884.076, 67.7796, 0),
+(@PATH, 49, 2569.03, 885.343, 66.4438, 0),
+(@PATH, 50, 2551.47, 885.757, 65.2873, 0),
+(@PATH, 51, 2529.49, 884.877, 64.7253, 0),
+(@PATH, 52, 2515.88, 884.324, 64.27, 0),
+(@PATH, 53, 2494.9, 883.438, 63.7383, 0),
+(@PATH, 54, 2476.21, 882.07, 63.1265, 0),
+(@PATH, 55, 2463.86, 879.17, 62.4931, 0),
+(@PATH, 56, 2437.2, 874.755, 60.551, 0),
+(@PATH, 57, 2415.99, 867.724, 58.1546, 0),
+(@PATH, 58, 2401.85, 862.609, 57.106, 0),
+(@PATH, 59, 2384.78, 859.055, 56.4635, 0),
+(@PATH, 60, 2365.69, 852.577, 55.5241, 0),
+(@PATH, 61, 2347.16, 847.12, 54.2153, 0),
+(@PATH, 62, 2324.49, 837.671, 53.7492, 0),
+(@PATH, 63, 2305.17, 829.589, 54.1504, 0),
+(@PATH, 64, 2283.7, 819.391, 54.5816, 0),
+(@PATH, 65, 2285.78, 832.717, 54.6634, 0),
+(@PATH, 66, 2285.61, 848.997, 54.5251, 0),
+(@PATH, 67, 2281.22, 866.684, 54.4996, 0),
+(@PATH, 68, 2274.42, 886.65, 54.4996, 0),
+(@PATH, 69, 2271.8, 896.994, 54.4996, 0),
+(@PATH, 70, 2283.58, 912.005, 54.3671, 0),
+(@PATH, 71, 2293.96, 921.826, 55.279, 0),
+(@PATH, 72, 2309.65, 924.832, 56.0533, 0),
+(@PATH, 73, 2326.83, 928.12, 55.0895, 0),
+(@PATH, 74, 2338.55, 925.683, 54.7203, 0),
+(@PATH, 75, 2338.17, 915.167, 55.198, 0),
+(@PATH, 76, 2334.54, 907.066, 57.6645, 0),
+(@PATH, 77, 2328.35, 889.876, 57.6674, 0),
+(@PATH, 78, 2321.92, 887.23, 57.6692, 0),
+(@PATH, 79, 2323.55, 888.326, 57.6692, 300000),
+(@PATH, 80, 2329.57, 892.875, 57.6662, 0),
+(@PATH, 81, 2334.01, 903.506, 57.6648, 0),
+(@PATH, 82, 2340.36, 921.749, 54.5965, 0),
+(@PATH, 83, 2334.77, 929.846, 54.9493, 0),
+(@PATH, 84, 2316.57, 926.323, 55.4144, 0),
+(@PATH, 85, 2300.02, 923.086, 55.9156, 0),
+(@PATH, 86, 2282.16, 920.261, 54.368, 0),
+(@PATH, 87, 2258.17, 928.854, 54.4995, 0),
+(@PATH, 88, 2252.08, 944.634, 54.4912, 0),
+(@PATH, 89, 2245.8, 960.966, 54.4995, 0),
+(@PATH, 90, 2240.95, 978.309, 54.4996, 0),
+(@PATH, 91, 2235.7, 999.538, 54.3791, 0),
+(@PATH, 92, 2229.54, 1016.37, 53.5518, 0),
+(@PATH, 93, 2213.16, 1020.04, 51.3927, 0),
+(@PATH, 94, 2189.38, 1025.91, 47.3435, 0),
+(@PATH, 95, 2171.27, 1032.24, 44.2345, 0),
+(@PATH, 96, 2148.13, 1040.17, 40.3426, 0),
+(@PATH, 97, 2127.85, 1040.17, 37.3234, 0),
+(@PATH, 98, 2110.52, 1036.07, 34.628, 0),
+(@PATH, 99, 2090.02, 1027.34, 32.6423, 0),
+(@PATH, 100, 2072.19, 1024.75, 31.9712, 0),
+(@PATH, 101, 2053.09, 1027.53, 30.0452, 0),
+(@PATH, 102, 2029.54, 1038.47, 26.9195, 0),
+(@PATH, 103, 2009.98, 1040.73, 25.853, 0),
+(@PATH, 104, 2001.2, 1039.51, 25.2896, 0),
+(@PATH, 105, 1979.32, 1030.49, 24.9552, 0),
+(@PATH, 106, 1965.54, 1033.01, 23.7563, 0),
+(@PATH, 107, 1951.36, 1045.57, 21.1473, 0),
+(@PATH, 108, 1939.54, 1052.06, 20.2084, 0),
+(@PATH, 109, 1920.73, 1052.65, 19.2175, 0),
+(@PATH, 110, 1904.22, 1053.3, 18.0501, 0),
+(@PATH, 111, 1886.72, 1055.3, 18.0974, 0),
+(@PATH, 112, 1871.29, 1064.12, 16.6739, 0),
+(@PATH, 113, 1846.86, 1076.66, 13.798, 0),
+(@PATH, 114, 1837.21, 1077.89, 12.5072, 0),
+(@PATH, 115, 1821.72, 1073.54, 11.108, 0),
+(@PATH, 116, 1805.24, 1065.43, 8.95542, 0),
+(@PATH, 117, 1790.37, 1058.89, 7.72108, 0),
+(@PATH, 118, 1765.72, 1060.38, 6.87971, 0),
+(@PATH, 119, 1770.31, 1059.76, 6.87971, 120000),
+(@PATH, 120, 1783.56, 1058.86, 7.42003, 0),
+(@PATH, 121, 1794.47, 1058.99, 7.97726, 0),
+(@PATH, 122, 1807.51, 1065.96, 9.21146, 0),
+(@PATH, 123, 1825.51, 1074.67, 11.1986, 0),
+(@PATH, 124, 1836.73, 1077.79, 12.4331, 0),
+(@PATH, 125, 1848.64, 1076.24, 14.0606, 0),
+(@PATH, 126, 1858.05, 1071.44, 15.4975, 0),
+(@PATH, 127, 1880.12, 1058.81, 17.7728, 0),
+(@PATH, 128, 1894.45, 1053.66, 17.8059, 0),
+(@PATH, 129, 1913.2, 1053.16, 18.6841, 0),
+(@PATH, 130, 1931.36, 1052.92, 19.8936, 0),
+(@PATH, 131, 1944.75, 1049.13, 20.5239, 0),
+(@PATH, 132, 1954, 1042.49, 21.6457, 0),
+(@PATH, 133, 1964.44, 1033.57, 23.6144, 0),
+(@PATH, 134, 1975.82, 1029.8, 24.6549, 0),
+(@PATH, 135, 1983.12, 1030.86, 25.2257, 0),
+(@PATH, 136, 1993.08, 1035.62, 25.3041, 0),
+(@PATH, 137, 2007.14, 1040.49, 25.6891, 0),
+(@PATH, 138, 2018.65, 1039.88, 26.0706, 0),
+(@PATH, 139, 2032.41, 1037.2, 27.1894, 0),
+(@PATH, 140, 2047.44, 1029.89, 29.103, 0),
+(@PATH, 141, 2062.67, 1025.82, 31.2087, 0),
+(@PATH, 142, 2076.92, 1025.55, 32.3808, 0),
+(@PATH, 143, 2095.31, 1029.02, 32.8091, 0),
+(@PATH, 144, 2105.21, 1033.11, 33.8701, 0),
+(@PATH, 145, 2119.91, 1038.25, 36.1388, 0),
+(@PATH, 146, 2135.67, 1040.77, 38.3721, 0),
+(@PATH, 147, 2145.66, 1040.17, 39.9787, 0),
+(@PATH, 148, 2163.14, 1034.74, 42.9007, 0),
+(@PATH, 149, 2176.48, 1030.5, 45.1048, 0),
+(@PATH, 150, 2193.16, 1025.21, 47.957, 0),
+(@PATH, 151, 2206.78, 1021.86, 50.168, 0),
+(@PATH, 152, 2217.89, 1019.03, 52.3635, 0),
+(@PATH, 153, 2230.66, 1015.18, 53.5869, 0),
+(@PATH, 154, 2234.51, 999.913, 54.3663, 0),
+(@PATH, 155, 2239.39, 979.488, 54.5038, 0),
+(@PATH, 156, 2242.45, 967.077, 54.4997, 0),
+(@PATH, 157, 2249.13, 949.697, 54.4922, 0),
+(@PATH, 158, 2256.55, 926.348, 54.4994, 0),
+(@PATH, 159, 2264.17, 904.88, 54.5049, 0),
+(@PATH, 160, 2271.78, 885.601, 54.5015, 0),
+(@PATH, 161, 2278.94, 865.297, 54.4758, 0),
+(@PATH, 162, 2282.9, 846.983, 54.6272, 0),
+(@PATH, 163, 2283.47, 830.009, 54.7596, 0),
+(@PATH, 164, 2281.13, 816.505, 54.6117, 0),
+(@PATH, 165, 2276.22, 806.486, 54.5153, 0),
+(@PATH, 166, 2265.45, 790.047, 54.3814, 0),
+(@PATH, 167, 2256.38, 776.214, 53.6021, 0),
+(@PATH, 168, 2246.84, 764.769, 52.64, 0),
+(@PATH, 169, 2232.98, 748.998, 49.2838, 0),
+(@PATH, 170, 2221.36, 734.463, 45.4158, 0),
+(@PATH, 171, 2210.83, 720.879, 41.9219, 0),
+(@PATH, 172, 2198.42, 706.344, 38.1333, 0),
+(@PATH, 173, 2190.49, 692.252, 35.5654, 0),
+(@PATH, 174, 2184.56, 676.787, 34.1533, 0),
+(@PATH, 175, 2179.64, 658.68, 34.6227, 0),
+(@PATH, 176, 2175.14, 641.688, 33.7795, 0),
+(@PATH, 177, 2171.76, 621.264, 37.1826, 0),
+(@PATH, 178, 2169.33, 603.94, 40.0493, 0),
+(@PATH, 179, 2164.37, 580.871, 43.7035, 0),
+(@PATH, 180, 2159.85, 568.293, 46.738, 0),
+(@PATH, 181, 2151.5, 554.339, 50.1121, 0),
+(@PATH, 182, 2139.26, 538.204, 53.8114, 0),
+(@PATH, 183, 2124.7, 524.492, 56.6386, 0),
+(@PATH, 184, 2112.09, 512.415, 58.9956, 0),
+(@PATH, 185, 2101.86, 500.054, 61.4978, 0),
+(@PATH, 186, 2093.21, 485.163, 64.4652, 0),
+(@PATH, 187, 2087.71, 474.389, 65.8823, 0),
+(@PATH, 188, 2081.22, 453.773, 66.213, 0),
+(@PATH, 189, 2075.88, 433.463, 66.2423, 0),
+(@PATH, 190, 2069.13, 416.607, 66.1058, 0),
+(@PATH, 191, 2060.92, 398.711, 66.0681, 0),
+(@PATH, 192, 2052.46, 379.493, 65.8712, 0),
+(@PATH, 193, 2043.56, 358.103, 66.1094, 0),
+(@PATH, 194, 2032.41, 336.363, 66.0943, 0),
+(@PATH, 195, 2021.8, 319.675, 66.0953, 0),
+(@PATH, 196, 2008.19, 296.626, 66.1349, 0),
+(@PATH, 197, 1998.81, 281.854, 66.3684, 0),
+(@PATH, 198, 1988.77, 269.184, 67.0842, 0),
+(@PATH, 199, 1974.87, 253.446, 67.4902, 0),
+(@PATH, 200, 1964.27, 238.185, 67.6519, 0),
+(@PATH, 201, 1951.3, 219.171, 68.1409, 0),
+(@PATH, 202, 1960.73, 232.116, 67.995, 0),
+(@PATH, 203, 1971.48, 247.189, 67.5766, 0),
+(@PATH, 204, 1983.39, 261.055, 67.2802, 0),
+(@PATH, 205, 1993.67, 273.103, 66.8403, 0),
+(@PATH, 206, 2005.65, 288.315, 66.0724, 0),
+(@PATH, 207, 2017.05, 307.801, 66.096, 0),
+(@PATH, 208, 2028.96, 327.909, 66.1042, 0),
+(@PATH, 209, 2037.46, 342.5, 66.0831, 0),
+(@PATH, 210, 2042.81, 354.123, 66.1165, 0),
+(@PATH, 211, 2051.01, 372.133, 65.9799, 0),
+(@PATH, 212, 2059.64, 391.626, 66.0603, 0),
+(@PATH, 213, 2067.55, 408.235, 66.0527, 0),
+(@PATH, 214, 2073.75, 420.632, 66.1428, 0),
+(@PATH, 215, 2076.29, 429.107, 66.2477, 0),
+(@PATH, 216, 2080.9, 442.242, 66.309, 0),
+(@PATH, 217, 2086.34, 460.101, 66.0378, 0),
+(@PATH, 218, 2091.98, 476.118, 65.3368, 0),
+(@PATH, 219, 2099.79, 491.783, 62.9201, 0),
+(@PATH, 220, 2107.42, 503.331, 60.6828, 0),
+(@PATH, 221, 2118.76, 515.219, 58.1502, 0),
+(@PATH, 222, 2131.15, 527.571, 55.8886, 0),
+(@PATH, 223, 2140.79, 537.176, 53.7152, 0),
+(@PATH, 224, 2144.44, 542.761, 52.4192, 0),
+(@PATH, 225, 2154.29, 554.481, 49.7551, 0),
+(@PATH, 226, 2162.78, 568.52, 46.297, 0),
+(@PATH, 227, 2167.29, 582.38, 43.1949, 0),
+(@PATH, 228, 2170.78, 595.639, 41.1054, 0),
+(@PATH, 229, 2172.34, 615.971, 38.0711, 0),
+(@PATH, 230, 2175.06, 634.978, 34.2314, 0),
+(@PATH, 231, 2175.95, 643.187, 33.7847, 0),
+(@PATH, 232, 2179.23, 655.55, 34.7027, 0),
+(@PATH, 233, 2183.32, 670.979, 34.0321, 0),
+(@PATH, 234, 2187.82, 683.788, 34.6194, 0),
+(@PATH, 235, 2195.17, 695.803, 36.5461, 0),
+(@PATH, 236, 2202.93, 707.461, 38.9909, 0),
+(@PATH, 237, 2210.51, 717.339, 41.4097, 0),
+(@PATH, 238, 2219.58, 728.004, 44.3297, 0),
+(@PATH, 239, 2228.47, 739.519, 47.1595, 0),
+(@PATH, 240, 2237.1, 750.536, 50.0677, 0),
+(@PATH, 241, 2245.74, 761.556, 52.2765, 0),
+(@PATH, 242, 2253.97, 771.231, 53.3686, 0),
+(@PATH, 243, 2263.02, 783.428, 54.0886, 0),
+(@PATH, 244, 2272.15, 797.066, 54.6196, 0),
+(@PATH, 245, 2280.73, 809.495, 54.6687, 0),
+(@PATH, 246, 2289.92, 821.383, 54.4901, 0),
+(@PATH, 247, 2301.29, 827.138, 54.2022, 0),
+(@PATH, 248, 2317.03, 833.522, 54.0437, 0),
+(@PATH, 249, 2330.66, 838.962, 53.6741, 0),
+(@PATH, 250, 2343.41, 845.529, 54.1241, 0),
+(@PATH, 251, 2356.85, 849.453, 54.7519, 0),
+(@PATH, 252, 2370.29, 853.377, 55.8436, 0),
+(@PATH, 253, 2385.63, 858.48, 56.4489, 0),
+(@PATH, 254, 2395.35, 860.76, 56.7646, 0),
+(@PATH, 255, 2407.88, 863.791, 57.5737, 0),
+(@PATH, 256, 2423.09, 869.003, 59.0037, 0),
+(@PATH, 257, 2434.44, 872.88, 60.3057, 0),
+(@PATH, 258, 2449.86, 876.148, 61.1585, 0),
+(@PATH, 259, 2464.5, 879.114, 62.5365, 0);
+
+SET @NPC := 48018;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2051.33, 534.764, 73.7314, 0),
+(@PATH, 2, 2051.37, 537.969, 75.5968, 0),
+(@PATH, 3, 2052.96, 540.417, 76.9039, 0),
+(@PATH, 4, 2055.73, 542.917, 79.0258, 0),
+(@PATH, 5, 2062.07, 543.762, 79.1671, 0),
+(@PATH, 6, 2065.1, 542.501, 80.8321, 0),
+(@PATH, 7, 2067.21, 540.755, 82.38, 0),
+(@PATH, 8, 2068.8, 537.769, 84.3815, 0),
+(@PATH, 9, 2068.38, 534.491, 84.7589, 0),
+(@PATH, 10, 2065.29, 529.092, 85.5457, 0),
+(@PATH, 11, 2061.58, 528.074, 87.6418, 0),
+(@PATH, 12, 2058.9, 528.056, 89.2877, 0),
+(@PATH, 13, 2056.76, 529.256, 89.4443, 0),
+(@PATH, 14, 2053.23, 533.893, 89.8688, 0),
+(@PATH, 15, 2053.36, 536.69, 91.3677, 0),
+(@PATH, 16, 2055.02, 539.629, 92.9179, 0),
+(@PATH, 17, 2056.98, 541.084, 93.927, 0),
+(@PATH, 18, 2059.3, 541.865, 94.5266, 0),
+(@PATH, 19, 2061.57, 541.285, 94.9473, 0),
+(@PATH, 20, 2060.64, 535.156, 97.747, 0),
+(@PATH, 21, 2059.31, 530.842, 100.531, 0),
+(@PATH, 22, 2060.54, 535.707, 97.4071, 0),
+(@PATH, 23, 2061.93, 541.194, 94.9474, 0),
+(@PATH, 24, 2059.73, 541.924, 94.9474, 0),
+(@PATH, 25, 2057.16, 541.141, 94.0179, 0),
+(@PATH, 26, 2055.08, 539.1, 92.7484, 0),
+(@PATH, 27, 2053.35, 535.673, 90.6795, 0),
+(@PATH, 28, 2053.57, 533.008, 89.5515, 0),
+(@PATH, 29, 2056.91, 529.125, 89.4441, 0),
+(@PATH, 30, 2059.6, 527.72, 88.9857, 0),
+(@PATH, 31, 2062.49, 528.05, 87.0064, 0),
+(@PATH, 32, 2066.5, 529.085, 85.2376, 0),
+(@PATH, 33, 2068.44, 534.399, 84.7585, 0),
+(@PATH, 34, 2068.97, 537.733, 84.4412, 0),
+(@PATH, 35, 2067.32, 540.688, 82.4334, 0),
+(@PATH, 36, 2065.05, 542.714, 80.7385, 0),
+(@PATH, 37, 2061.49, 543.768, 79.1515, 0),
+(@PATH, 38, 2056.66, 542.996, 79.1417, 0),
+(@PATH, 39, 2052.79, 540.14, 76.7666, 0),
+(@PATH, 40, 2051.49, 537.149, 75.2349, 0),
+(@PATH, 41, 2051.51, 534, 73.454, 0),
+(@PATH, 42, 2053.59, 529.433, 73.3263, 0),
+(@PATH, 43, 2056.51, 526.283, 72.3833, 0),
+(@PATH, 44, 2059.3, 525.417, 71.1581, 0),
+(@PATH, 45, 2065.27, 527.393, 70.1031, 0),
+(@PATH, 46, 2065.1, 541.582, 65.4417, 0),
+(@PATH, 47, 2051.87, 540.313, 65.4373, 0),
+(@PATH, 48, 2038.58, 546.649, 65.4359, 0),
+(@PATH, 49, 2052.26, 540.102, 65.4373, 0),
+(@PATH, 50, 2065.8, 541.531, 65.4401, 0),
+(@PATH, 51, 2070, 536.38, 65.7323, 0),
+(@PATH, 52, 2069.49, 531.268, 67.8543, 0),
+(@PATH, 53, 2065.26, 526.944, 70.2077, 0),
+(@PATH, 54, 2059.02, 525.775, 71.3116, 0),
+(@PATH, 55, 2056.32, 527.167, 72.5036, 0),
+(@PATH, 56, 2053.58, 529.718, 73.3264, 0);
+
+-- -------------Guard
+-- Guards In Tower Near Southshore and Terran Mill
+DELETE FROM `creature_formations` WHERE `leaderGUID`=44653;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(44653, 44653, 0, 0, 2, 0, 0),
+(44653, 44656, 0, 0, 2, 0, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=46842;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(46842, 46842, 0, 0, 2, 0, 0),
+(46842, 46850, 0, 0, 2, 0, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=31908;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(31908, 31908, 0, 0, 2, 0, 0),
+(31908, 47583, 0, 0, 2, 0, 0),
+(31908, 47894, 0, 0, 2, 0, 0);
+
+-- Innkeeper in Terran Mill
+SET @NPC := 83455;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2659.13, 661.505, 57.1724, 0),
+(@PATH, 2, 2666.43, 656.46, 57.6475, 0),
+(@PATH, 3, 2665.61, 653.988, 57.6495, 0),
+(@PATH, 4, 2666.8, 656.365, 57.6495, 0),
+(@PATH, 5, 2662.14, 659.49, 57.1598, 0),
+(@PATH, 6, 2659.78, 661.332, 57.1711, 0),
+(@PATH, 7, 2656.51, 662.994, 57.1711, 0),
+(@PATH, 8, 2661.96, 673.283, 57.1711, 0),
+(@PATH, 9, 2657.29, 664.071, 57.1711, 0),
+(@PATH, 10, 2651.64, 666.535, 57.1711, 0),
+(@PATH, 11, 2654.13, 671.54, 57.1711, 0),
+(@PATH, 12, 2651.96, 667.148, 57.1711, 0),
+(@PATH, 13, 2654.05, 665.667, 57.1711, 0),
+(@PATH, 14, 2653.07, 662.969, 57.1724, 5000),
+(@PATH, 15, 2654.46, 665.262, 57.1724, 0),
+(@PATH, 16, 2658.31, 661.64, 57.1724, 0),
+(@PATH, 17, 2666.47, 656.886, 57.6466, 8000),
+(@PATH, 18, 2661.97, 659.914, 57.1601, 0),
+(@PATH, 19, 2659.86, 657.466, 57.1623, 5000),
+(@PATH, 20, 2661.44, 662.396, 57.1711, 8000),
+(@PATH, 21, 2657.02, 663.077, 57.1711, 0);
+
+-- ===========
+-- Orcs In Pit
+-- ===========
+UPDATE `creature` SET `position_x` = 2115.998779, `position_y` = 42.767368, `position_z` = 54.557854, `orientation` = 3.667591 WHERE `guid` = 83918;
+DELETE FROM `creature_addon` WHERE `guid` IN (83918);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83918,0,0,3,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2104.535889, `position_y` = 56.620735, `position_z` = 54.242908, `orientation` = 4.917089 WHERE `guid` = 83916;
+DELETE FROM `creature_addon` WHERE `guid` IN (83916);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83916,0,0,3,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2066.981934, `position_y` = 67.596283, `position_z` = 54.343513, `orientation` = 6.107752 WHERE `guid` = 83925;
+DELETE FROM `creature_addon` WHERE `guid` IN (83925);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83925,0,0,3,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2072.802490, `position_y` = 88.352287, `position_z` = 54.845284, `orientation` = 3.299170 WHERE `guid` = 83946;
+DELETE FROM `creature_addon` WHERE `guid` IN (83946);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83946,0,0,3,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2062.651367, `position_y` = 112.068413, `position_z` = 55.389854, `orientation` = 1.968705 WHERE `guid` = 83919;
+DELETE FROM `creature_addon` WHERE `guid` IN (83919);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83919,0,0,3,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2058.154053, `position_y` = 117.512825, `position_z` = 55.403820, `orientation` = 5.780243 WHERE `guid` = 83920;
+DELETE FROM `creature_addon` WHERE `guid` IN (83920);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83920,0,0,3,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2208.021240, `position_y` = 267.573883, `position_z` = 54.778271, `orientation` = 4.669735 WHERE `guid` = 83964;
+DELETE FROM `creature_addon` WHERE `guid` IN (83964);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83964,0,0,3,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2224.651367, `position_y` = 247.469345, `position_z` = 53.833801, `orientation` = 2.452557 WHERE `guid` = 83965;
+DELETE FROM `creature_addon` WHERE `guid` IN (83965);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83965,0,0,1,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2105.004150, `position_y` = 90.833382, `position_z` = 53.709354, `orientation` = 2.033894 WHERE `guid` = 83456;
+DELETE FROM `creature_addon` WHERE `guid` IN (83456);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83456,0,0,1,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2106.529785, `position_y` = 99.617836, `position_z` = 53.004929, `orientation` = 3.877224 WHERE `guid` = 83915;
+DELETE FROM `creature_addon` WHERE `guid` IN (83915);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83915,0,0,1,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2097.408936, `position_y` = 96.302238, `position_z` = 53.166386, `orientation` = 6.253055 WHERE `guid` = 83914;
+DELETE FROM `creature_addon` WHERE `guid` IN (83914);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83914,0,0,1,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2178.179443, `position_y` = 235.513840, `position_z` = 52.484241, `orientation` = 5.307471 WHERE `guid` = 83952;
+DELETE FROM `creature_addon` WHERE `guid` IN (83952);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(83952,0,0,1,0,0, '');
+
+UPDATE `creature` SET `position_x` = 2070.596924, `position_y` = 128.493576, `position_z` = 54.269028, `orientation` = 1.757468, `SpawnDist` = 5, `MovementType` = 1 WHERE `guid` = 83921;
+
+UPDATE `creature` SET `position_x` = 2103.312012, `position_y` = 79.108421, `position_z` = 52.891743, `orientation` = 2.787092, `SpawnDist`=10, `MovementType`=1 WHERE `guid` = 83917;
+
+UPDATE `creature` SET `SpawnDist` = 5, `MovementType` = 1 WHERE `guid` IN (83953,83954,83957);
+
+SET @NPC := 83947;
+SET @PATH := @NPC * 10;
+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,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2180.82, 233.922, 52.4421, 0),
+(@PATH, 2, 2190.96, 246.4, 52.5535, 0),
+(@PATH, 3, 2183.91, 242.109, 52.8828, 0),
+(@PATH, 4, 2178.55, 227.63, 52.4409, 0),
+(@PATH, 5, 2158.69, 218.061, 52.536, 0),
+(@PATH, 6, 2147.28, 209.24, 52.8493, 0),
+(@PATH, 7, 2137.69, 195.197, 52.4411, 0),
+(@PATH, 8, 2128.08, 184.306, 52.7819, 0),
+(@PATH, 9, 2121.61, 171.933, 52.7363, 0),
+(@PATH, 10, 2111.17, 158.333, 52.441, 0),
+(@PATH, 11, 2105.6, 139.581, 52.8057, 0),
+(@PATH, 12, 2094.98, 124.519, 52.4842, 0),
+(@PATH, 13, 2092.72, 96.002, 52.4763, 0),
+(@PATH, 14, 2091.2, 76.6567, 52.8143, 0),
+(@PATH, 15, 2078.5, 69.1538, 53.7881, 0),
+(@PATH, 16, 2072.3, 67.2213, 53.7802, 0),
+(@PATH, 17, 2068.55, 74.1697, 53.7048, 0),
+(@PATH, 18, 2061.92, 89.1792, 54.1012, 0),
+(@PATH, 19, 2067.51, 74.6493, 53.7406, 0),
+(@PATH, 20, 2072.52, 67.0591, 53.7853, 0),
+(@PATH, 21, 2080.31, 69.6531, 53.7724, 0),
+(@PATH, 22, 2089.71, 73.7002, 52.751, 0),
+(@PATH, 23, 2105.1, 66.6614, 52.5804, 0),
+(@PATH, 24, 2115.84, 65.2019, 52.6007, 0),
+(@PATH, 25, 2107.39, 83.1457, 53.3359, 0),
+(@PATH, 26, 2093.76, 89.7505, 52.4537, 0),
+(@PATH, 27, 2096.11, 107.581, 52.7549, 0),
+(@PATH, 28, 2101.5, 127.271, 52.5706, 0),
+(@PATH, 29, 2108.5, 146.257, 52.4418, 0),
+(@PATH, 30, 2115.04, 159.756, 52.5111, 0),
+(@PATH, 31, 2120.53, 167.026, 52.6508, 0),
+(@PATH, 32, 2124.68, 178.425, 52.634, 0),
+(@PATH, 33, 2131.69, 188.464, 52.5914, 0),
+(@PATH, 34, 2141.64, 198.599, 52.4418, 0),
+(@PATH, 35, 2153.1, 209.287, 53.1284, 0),
+(@PATH, 36, 2167.16, 227.906, 52.4409, 0),
+(@PATH, 37, 2163.87, 233.083, 52.4411, 0),
+(@PATH, 38, 2157.18, 241.131, 53.8787, 0),
+(@PATH, 39, 2158.75, 247.807, 53.9186, 0),
+(@PATH, 40, 2166.33, 247.603, 53.7073, 0),
+(@PATH, 41, 2158.31, 238.862, 53.8797, 0),
+(@PATH, 42, 2167.1, 228.618, 52.4411, 0),
+(@PATH, 43, 2180.26, 229.167, 52.4411, 0),
+(@PATH, 44, 2187.37, 241.135, 52.6137, 0);
+
+-- ======================
+-- Gameobject Spawn Fixes 
+-- ======================
+-- Minerals and Herbs Not Spawned in Heroic Mode
+UPDATE `gameobject` SET `SpawnMask` = 3, `SpawnTimeSecs` = 86400 WHERE `map`=560 AND `ID` IN (181270,181275,181276,181278,181556,181569);
+
+-- ===========================================
+-- Creature Spawn Time Fixes (24 Hour Respawn) - Confirmed No Special Short Spawn Time NPC
+-- ===========================================
+UPDATE `creature` SET `SpawnTimeSecs` = 86400 WHERE `map` IN (560);
+UPDATE `creature` SET `SpawnTimeSecs` = 180 WHERE `map` IN (560) AND id IN (2350,2385,2408,2354);
diff --git a/sql/updates/world/master/2018_03_17_62_world_2017_01_04_01_world.sql b/sql/updates/world/master/2018_03_17_62_world_2017_01_04_01_world.sql
new file mode 100644
index 000000000..67317e0d3
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_62_world_2017_01_04_01_world.sql
@@ -0,0 +1,69 @@
+-- Image of Commander Ameer SAI
+SET @ENTRY := 20553;
+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,63,0,100,0,0,0,0,0,11,12980,0,0,0,0,0,1,0,0,0,0,0,0,0,"Image of Commander Ameer - On Just Created - Cast 'Simple Teleport'");
+
+-- Image of Agent Ya-six SAI
+SET @ENTRY := 20564;
+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,63,0,100,0,0,0,0,0,11,12980,0,0,0,0,0,1,0,0,0,0,0,0,0,"Image of Agent Ya-six - On Just Created - Cast 'Simple Teleport'");
+
+DELETE FROM `creature` WHERE `guid` IN (72679,72694);
+DELETE FROM `creature_addon` WHERE `guid` IN (72679,72694);
+UPDATE `creature_template` SET `InhabitType` = 4 WHERE `entry` IN (20553, 20564);
+UPDATE `gameobject` SET `spawntimesecs` = 1 WHERE `id` = 184434;
+
+-- Agent Araxes SAI
+SET @ENTRY := 20551;
+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,25,0,100,0,0,0,0,0,53,0,20551,1,0,0,0,1,0,0,0,0,0,0,0,"Agent Araxes - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Agent Araxes - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,2,20551,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Agent Araxes - On Waypoint 2 Reached - Pause Waypoint"),
+(@ENTRY,0,3,0,40,0,100,0,1,20551,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Agent Araxes - On Waypoint 1 Reached - Run Script"),
+(@ENTRY,0,4,0,17,0,100,0,20553,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Agent Araxes - On Summoned Unit - Store Targetlist"),
+(@ENTRY,0,5,0,17,0,100,0,20564,0,0,0,64,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Agent Araxes - On Summoned Unit - Store Targetlist");
+
+-- Actionlist SAI
+SET @ENTRY := 2055100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.67552,"Agent Araxes - On Script - Set Orientation 1.67552"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,1,0,4000,0,0,0,0,1,0,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,20,184434,50,0,0,0,0,0,"Agent Araxes - On Script - Activate Gameobject"),
+(@ENTRY,9,3,0,0,0,100,0,2000,2000,0,0,12,20553,3,31000,0,0,0,8,0,0,0,3781.9,2175.33,142.558,4.99164,"Agent Araxes - On Script - Summon Creature 'Image of Commander Ameer'"),
+(@ENTRY,9,4,0,0,0,100,0,2000,2000,0,0,1,0,5000,0,0,0,0,12,1,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 0"),
+(@ENTRY,9,5,0,0,0,100,0,5000,5000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 1"),
+(@ENTRY,9,6,0,0,0,100,0,5000,5000,0,0,1,1,6000,0,0,0,0,12,1,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 1"),
+(@ENTRY,9,7,0,0,0,100,0,5000,5000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 2"),
+(@ENTRY,9,8,0,0,0,100,0,6000,6000,0,0,1,2,6000,0,0,0,0,12,1,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 2"),
+(@ENTRY,9,9,0,0,0,100,0,6000,6000,0,0,1,3,5000,0,0,0,0,12,1,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 3"),
+(@ENTRY,9,10,0,0,0,100,0,2000,2000,0,0,32,0,0,0,0,0,0,20,184434,50,0,0,0,0,0,"Agent Araxes - On Script -  Activate Gameobject"),
+(@ENTRY,9,11,0,0,0,100,0,0,0,0,0,12,20564,3,11000,0,0,0,8,0,0,0,3781.898,2175.332,142.5583,4.991642,"Agent Araxes - On Script - Summon Creature 'Image of Agent Ya-six'"),
+(@ENTRY,9,12,0,0,0,100,0,2000,2000,0,0,1,0,5000,0,0,0,0,12,2,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 0"),
+(@ENTRY,9,13,0,0,0,100,0,5000,5000,0,0,1,1,6000,0,0,0,0,12,2,0,0,0,0,0,0,"Agent Araxes - On Script - Say Line 1");
+
+DELETE FROM `waypoints` WHERE `entry`=20551;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(20551, 1, 3782.49,2170.66,141.422, 'Agent Araxes'),
+(20551, 2, 3782.49,2170.66,141.422, 'Agent Araxes');
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (20551, 20553, 20564);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `Comment`) VALUES 
+-- Agent Araxes
+(20551, 0, 0, 'I hope this damned thing works. *Araxes pounds on the portable transponder.*', 12, 0, 100, 1, 0, 0, 18256, 'Agent Araxes'),
+(20551, 1, 0, 'I\'m here, commander.', 12, 0, 100, 1, 0, 0, 18267, 'Agent Araxes'),
+(20551, 2, 0, 'We\'ve located the mark, commander. Ya-six and I have been separated. Requesting backup.', 12, 0, 100, 1, 0, 0, 18268, 'Agent Araxes'),
+-- Image of Commander Ameer
+(20553, 0, 0, 'Araxes, come in... Are you there Araxes? Visibility is nil. Warp storms blocking us.', 12, 0, 100, 1, 0, 0, 18249, 'Image of Commander Ameer'),
+(20553, 1, 0, 'Copy. Status report, soldier.', 12, 0, 100, 1, 0, 0, 18250, 'Image of Commander Ameer'),
+(20553, 2, 0, 'Copy that, Araxes. Backup is on the way. Hold your position. I repeat, hold your position.', 12, 0, 100, 1, 0, 0, 18269, 'Image of Commander Ameer'),
+(20553, 3, 0, 'Ameer, over and out.', 12, 0, 100, 1, 0, 0, 18270, 'Image of Commander Ameer'),
+-- Image of Agent Ya-six
+(20564, 0, 0, 'Araxes! Send help! I\'m pinned down in the mines. I... I\'m not sure where I am exactly but I had the presence of mind to drop tracers on the ground behind me.', 12, 0, 100, 1, 0, 0, 18281, 'Image of Agent Ya-six'),
+(20564, 1, 0, 'I can\'t follow the tracers back out, too many flesh beasts in the way. Send someone in... Follow the tracers... Ya-six, out.', 12, 0, 100, 1, 0, 0, 18282, 'Image of Agent Ya-six');
diff --git a/sql/updates/world/master/2018_03_17_63_world_2017_01_05_02_world.sql b/sql/updates/world/master/2018_03_17_63_world_2017_01_05_02_world.sql
new file mode 100644
index 000000000..911e4ec55
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_63_world_2017_01_05_02_world.sql
@@ -0,0 +1,26 @@
+DELETE FROM `creature` WHERE `id` in (20480,20496);
+-- Tormented Soul SAI
+SET @ENTRY := 20512;
+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,87,2048000,2048001,0,0,0,0,1,0,0,0,0,0,0,0,"Tormented Soul - On Aggro - Run Random Script");
+
+-- Tormented Citizen SAI
+SET @ENTRY := 21065;
+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,87,2048000,2048001,0,0,0,0,1,0,0,0,0,0,0,0,"Tormented Citizen - On Aggro - Run Random Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2048000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,3,20480,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormented - On Script - Morph To Creature Kirin'Var Ghost");
+
+-- Actionlist SAI
+SET @ENTRY := 2048001;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,3,20496,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormented - On Script - Morph To Creature Kirin'Var Spectre");
diff --git a/sql/updates/world/master/2018_03_17_64_world_2017_01_05_03_world.sql b/sql/updates/world/master/2018_03_17_64_world_2017_01_05_03_world.sql
new file mode 100644
index 000000000..ac3a958e9
--- /dev/null
+++ b/sql/updates/world/master/2018_03_17_64_world_2017_01_05_03_world.sql
@@ -0,0 +1,2 @@
+-- 
+DELETE FROM `creature_loot_template` WHERE `item` = 23612 AND `entry` IN (21060,21061);
diff --git a/sql/updates/world/master/2018_03_18_00_world.sql b/sql/updates/world/master/2018_03_18_00_world.sql
new file mode 100644
index 000000000..0eeab7535
--- /dev/null
+++ b/sql/updates/world/master/2018_03_18_00_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature` SET `spawnMask`=6 WHERE `guid` IN (6998,77806,77816,77817,77818,77819,77820,77854,83923,83926,83928,83929,83932,83933,83959,83972);
+UPDATE `gameobject` SET `SpawnMask`=6 WHERE `map`=560 AND `ID` IN (181270,181275,181276,181278,181556,181569);