diff --git a/README.md b/README.md
index a97d007689c..9caea2e62c0 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=1310)](https://www.bountysource.com/trackers/1310-trinity-core?utm_source=1310&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a0ba43980b804281bdfe468300614fd3)](https://www.codacy.com/app/TrinityCore/TrinityCore_434?utm_source=github.com&utm_medium=referral&utm_content=TrinityCoreLegacy/TrinityCore&utm_campaign=Badge_Grade)
+
 ## Build Status
 
 
@@ -71,7 +73,7 @@ reports are wasteful and are subject to deletion.
 
 Fixes are submitted as pull requests via Github. For more information on how to
 properly submit a pull request, read the [how-to: maintain a remote fork](https://www.trinitycore.org/f/topic/6037-howto-maintain-a-remote-fork-for-pull-requests-tortoisegit/).
-NOTE: if a fix is valid also for 3.3.5a/6.x branches submit them also to [Github](https://github.com/TrinityCore/TrinityCore)
+NOTE: if a fix is valid also for 3.3.5a/master branches submit them also to [Github](https://github.com/TrinityCore/TrinityCore)
 
 
 ## Copyright
diff --git a/contrib/merge_updates_unix.sh b/contrib/merge_updates_unix.sh
index e9362722934..66730937f3b 100644
--- a/contrib/merge_updates_unix.sh
+++ b/contrib/merge_updates_unix.sh
@@ -1 +1,2 @@
+#!/bin/bash
 cat ../sql/updates/world/4.3.4/*.sql > world_update.sql
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index b97343966c7..4b52841c480 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -965,6 +965,7 @@ INSERT INTO `rbac_linked_permissions` VALUES
 (196,753),
 (196,757),
 (196,773),
+(196,775),
 (196,777),
 (196,836),
 (196,837),
@@ -1832,6 +1833,7 @@ INSERT INTO `rbac_permissions` VALUES
 (772,'Command: wp unload'),
 (773,'Command: wp reload'),
 (774,'Command: wp show'),
+(775,'Command: modify currency'),
 (777,'Command: mailbox'),
 (778,'Command: ahbot'),
 (779,'Command: ahbot items'),
@@ -2005,7 +2007,8 @@ INSERT INTO `updates` VALUES
 ('2018_01_15_00_auth.sql','1C5C28490B27D86EBC14F6034AA4D34E66D5545D','ARCHIVED','2018-01-15 01:40:04',0),
 ('2018_02_16_00_auth.sql','1AAD2FC649CBE8093ECE5908EBBBB31EC326166A','ARCHIVED','2018-02-16 01:40:04',0),
 ('2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql','3F8EA885898CE0F9D47043A832602D77','ARCHIVED','2018-02-16 01:40:04',0),
-('2018_03_16_00_auth.sql','E77AFBFE7C1DEC8839AECC40140ED1AF55B56A10','ARCHIVED','2018-03-16 01:40:04',0);
+('2018_03_16_00_auth.sql','E77AFBFE7C1DEC8839AECC40140ED1AF55B56A10','ARCHIVED','2018-03-16 01:40:04',0),
+('2018_03_28_00_auth.sql','45A7C896BDF00B1C319C9F889893D3B95E45EF0A','ARCHIVED','2018-03-28 01:40:04',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 97e9ceac9d2..97d04fa0345 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2953,8 +2953,8 @@ INSERT INTO `updates` VALUES
 ('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0),
 ('2018_01_15_00_characters.sql','43C8E4549E1AA9610B377BC7139C88C63D0DC193','ARCHIVED','2018-01-15 00:00:00',0),
 ('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0),
-('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','RELEASED','2018-03-16 00:00:00',0),
-('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','RELEASED','2018-03-25 00:00:00',0);
+('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','ARCHIVED','2018-03-16 00:00:00',0),
+('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2018-03-25 00:00:00',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/auth/4.3.4/2018_03_28_00_auth.sql b/sql/updates/auth/4.3.4/2018_03_28_00_auth.sql
new file mode 100644
index 00000000000..3aa8f576a0d
--- /dev/null
+++ b/sql/updates/auth/4.3.4/2018_03_28_00_auth.sql
@@ -0,0 +1,5 @@
+DELETE FROM `rbac_permissions` WHERE `id`= 775;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (775, 'Command: modify currency');
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId`= 775;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(196, 775);
diff --git a/sql/updates/world/4.3.4/2018_03_28_01_world.sql b/sql/updates/world/4.3.4/2018_03_28_01_world.sql
new file mode 100644
index 00000000000..ab47e85a374
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_28_01_world.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc` SET `SpellFamilyMask0`=`SpellFamilyMask0`|0x1000 WHERE `SpellId`=57529;
diff --git a/sql/updates/world/4.3.4/2018_03_29_00_world_from_335_was_2018_03_17_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_00_world_from_335_was_2018_03_17_00_world_335.sql
new file mode 100644
index 00000000000..8bcae4ae744
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_00_world_from_335_was_2018_03_17_00_world_335.sql
@@ -0,0 +1,19 @@
+/*
+-- Vindicator Vedaar --> Fix Gossip Texts
+DELETE FROM `gossip_menu` WHERE `MenuID`=7407 AND `TextID` IN (8878,8877);
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(7407,8878,0),
+(7407,8877,0);
+
+UPDATE `npc_text` SET `em0_1`=6, `em0_3`=274 WHERE `ID`=8876;
+DELETE FROM `npc_text` WHERE `ID`=8877;
+INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `Probability0`, `em0_1`) VALUES
+(8877,"Now that the demons have been dealt with, we can proceed with the establishment of a new base here.","",13767,0,1,1);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7407;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,7407,8878,0,0,8,0,9516,0,0,0,0,0,"","Show gossip text 8878 if quest 'Destroy the Legion' is rewarded"),
+(14,7407,8878,0,0,8,0,9522,0,0,1,0,0,"","Show gossip text 8878 if quest 'Never Again!' is NOT rewarded"),
+(14,7407,8877,0,0,8,0,9516,0,0,0,0,0,"","Show gossip text 8877 if quest 'Destroy the Legion' is rewarded"),
+(14,7407,8877,0,0,8,0,9522,0,0,0,0,0,"","Show gossip text 8877 if quest 'Never Again!' is rewarded");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_01_world_from_335_was_2018_03_17_01_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_01_world_from_335_was_2018_03_17_01_world_335.sql
new file mode 100644
index 00000000000..c2ed44c9d49
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_01_world_from_335_was_2018_03_17_01_world_335.sql
@@ -0,0 +1,24 @@
+/*
+-- 
+-- Summoned Voidwalker
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5676 AND `source_type`=0 AND `id` IN (2,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
+(5676,0,2,0,11,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Voidwalker - On Respawn - Say Line 0"),
+(5676,0,3,0,4,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Voidwalker - On Aggro - Say Line 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=5676;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5676,0,0,"Who dares summon the power of the void?",12,8,100,0,0,0,1986,0,"Summoned Voidwalker"),
+(5676,1,0,"You will live forever in torment for this, pathetic warlock.",12,8,100,0,0,0,1987,0,"Summoned Voidwalker");
+
+-- Summoned Succubus
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5677;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5677 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
+(5677,0,0,0,11,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Succubus - On Respawn - Say Line 0"),
+(5677,0,1,0,0,0,100,0,3000,5000,7000,11000,11,16583,0,0,0,0,0,2,0,0,0,0,0,0,0,"Summoned Succubus - In Combat - Cast 'Shadow Shock'");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=5677;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5677,0,0,"Interesting... Now this is more than I expected. Delicious...",12,8,100,0,0,0,1991,0,"Summoned Succubus");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_02_world_from_335_was_2018_03_17_02_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_02_world_from_335_was_2018_03_17_02_world_335.sql
new file mode 100644
index 00000000000..36ae06b1231
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_02_world_from_335_was_2018_03_17_02_world_335.sql
@@ -0,0 +1,20 @@
+/*
+-- Quest "Onu is Meditating"
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=961;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19,0,961,0,0,14,0,944,0,0,1,0,0,"","Show quest 'Onu is Meditating' if quest 'The Master's Glaive' is taken"),
+(19,0,961,0,0,14,0,949,0,0,0,0,0,"","Show quest 'Onu is Meditating' only if quest 'The Twilight Camp' is not taken and not rewarded"),
+(19,0,961,0,0,2,0,5251,1,1,1,0,0,"","Show quest 'Onu is Meditating' only if player does not have item 'Phial of Scrying'");
+
+DELETE FROM `quest_template_addon` WHERE `ID`=961;
+INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
+(961,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1);
+
+DELETE FROM `creature_text` WHERE `CreatureID`=3616 AND `GroupID`=3;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(3616,3,0,"%s continues his meditations...",16,0,100,0,0,0,1219,0,"Onu");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=3616 AND `source_type`=0 AND `id`=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
+(3616,0,1,0,20,0,100,0,961,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Onu - On Quest 'Onu is Meditating' Finished - Say Line 3");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_03_world_from_335_was_2018_03_17_03_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_03_world_from_335_was_2018_03_17_03_world_335.sql
new file mode 100644
index 00000000000..e34f233e71e
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_03_world_from_335_was_2018_03_17_03_world_335.sql
@@ -0,0 +1,34 @@
+/*
+-- Godrick Farsan
+DELETE FROM `creature_text` WHERE `CreatureID`=5693;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5693,0,0,"This is Dalin Forgewright. He fled from Lordaeron when the plague struck, taking his love with him.",12,0,100,1,0,0,1988,0,"Godrick Farsan"),
+(5693,1,0,"When he came upon the refugees at the Greymane Wall, he felt it his duty to succor them, sending his woman on to Hillsbrad.",12,0,100,1,0,0,1992,0,"Godrick Farsan"),
+(5693,2,0,"And this is Comar Villard. Two weeks married, his wife was spirited away from the safety of Menethil Harbor.",12,0,100,1,0,0,1989,0,"Godrick Farsan"),
+(5693,3,0,"Five and five years, and he still searches for her, though she was no beauty, and there were many ladies that would take her place.",12,0,100,1,0,0,1993,0,"Godrick Farsan"),
+(5693,4,0,"Fools.",12,0,100,5,0,0,1990,0,"Godrick Farsan");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5693;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5693 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=569300 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
+(5693,0,0,0,19,0,100,0,1476,0,0,0,80,569300,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Quest 'Hearts of the Pure' Taken - Run Script"),
+(569300,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,"Godrick Farsan - On Script - Remove Npc Flag Questgiver"),
+(569300,9,1,0,0,0,100,0,0,0,0,0,11,7794,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Script - Cast 'Teleport'"),
+(569300,9,2,0,0,0,100,0,1000,1000,0,0,12,5691,3,14000,0,0,0,8,0,0,0,1780.01,59.7745,-61.4891,6.22813,"Godrick Farsan - On Script - Summon Creature 'Dalin Forgewright Projection'"),
+(569300,9,3,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Script - Say Line 0"),
+(569300,9,4,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Script - Say Line 1"),
+(569300,9,5,0,0,0,100,0,7000,7000,0,0,11,7794,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Script - Cast 'Teleport'"),
+(569300,9,6,0,0,0,100,0,1000,1000,0,0,12,5692,3,15000,0,0,0,8,0,0,0,1780.01,59.7745,-61.4891,6.22813,"Godrick Farsan - On Script - Summon Creature 'Comar Villard Projection'"),
+(569300,9,7,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Script - Say Line 2"),
+(569300,9,8,0,0,0,100,0,6500,6500,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Script - Say Line 3"),
+(569300,9,9,0,0,0,100,0,9000,9000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Script - Say Line 4"),
+(569300,9,10,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Godrick Farsan - On Script - Add Npc Flag Questgiver");
+
+-- Comar Villard
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5683;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5683 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
+(5683,0,0,0,0,0,100,0,5000,7000,9000,12000,11,12540,0,0,0,0,0,2,0,0,0,0,0,0,0,"Comar Villard - In Combat - Cast 'Gouge'"),
+(5683,0,1,0,25,0,100,0,0,0,0,0,11,3417,0,0,0,0,0,1,0,0,0,0,0,0,0,"Comar Villard - On Reset - Cast 'Thrash'");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_04_world_from_335_was_2018_03_17_04_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_04_world_from_335_was_2018_03_17_04_world_335.sql
new file mode 100644
index 00000000000..e7602b60d2c
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_04_world_from_335_was_2018_03_17_04_world_335.sql
@@ -0,0 +1,54 @@
+/*
+-- Takar the Seer
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6244;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6244 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=624400 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
+(6244,0,0,0,19,0,100,0,1738,0,0,0,80,624400,0,0,0,0,0,1,0,0,0,0,0,0,0,"Takar the Seer - On Quest 'Heartswood' Taken - Run Script"),
+(624400,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,"Takar the Seer - On Script - Remove Npc Flag Questgiver"),
+(624400,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,"Takar the Seer - On Script - Say Line 0"),
+(624400,9,2,0,0,0,100,0,7000,7000,0,0,11,7794,0,0,0,0,0,1,0,0,0,0,0,0,0,"Takar the Seer - On Script - Cast 'Teleport'"),
+(624400,9,3,0,0,0,100,0,1000,1000,0,0,12,6245,3,51000,0,0,0,8,0,0,0,-2246.8,-2369.11,91.6667,0.623109,"Takar the Seer - On Script - Summon Creature 'Anathera'"),
+(624400,9,4,0,0,0,100,0,0,0,0,0,12,6246,3,51000,0,0,0,8,0,0,0,-2248.94,-2371.09,91.6667,3.65082,"Takar the Seer - On Script - Summon Creature 'Latherion'"),
+(624400,9,5,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Takar the Seer - On Script - Say Line 1"),
+(624400,9,6,0,0,0,100,0,7000,7000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Takar the Seer - On Script - Say Line 2"),
+(624400,9,7,0,0,0,100,0,8000,8000,0,0,90,7,0,0,0,0,0,19,6245,0,0,0,0,0,0,"Takar the Seer - On Script - Set Flag Standstate 'Dead' (Anathera)"),
+(624400,9,8,0,0,0,100,0,1000,1000,0,0,45,1,1,0,0,0,0,19,6246,0,0,0,0,0,0,"Takar the Seer - On Script - Set Data to Latherion"),
+(624400,9,9,0,0,0,100,0,6000,6000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Takar the Seer - On Script - Say Line 3"),
+(624400,9,10,0,0,0,100,0,9000,9000,0,0,91,8,0,0,0,0,0,19,6246,0,0,0,0,0,0,"Takar the Seer - On Script - Remove Flag Standstate 'Kneel' (Latherion)"),
+(624400,9,11,0,0,0,100,0,0,0,0,0,90,7,0,0,0,0,0,19,6246,0,0,0,0,0,0,"Takar the Seer - On Script - Set Flag Standstate 'Dead' (Latherion)"),
+(624400,9,12,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,19,6246,0,0,0,0,0,0,"Takar the Seer - On Script - Say Line 1 (Latherion)"),
+(624400,9,13,0,0,0,100,0,10000,10000,0,0,1,0,0,0,0,0,0,19,6245,0,0,0,0,0,0,"Takar the Seer - On Script - Say Line 0 (Anathera)"),
+(624400,9,14,0,0,0,100,0,5000,5000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Takar the Seer - On Script - Say Line 4"),
+(624400,9,15,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Takar the Seer - On Script - Add Npc Flag Questgiver");
+
+-- Anathera
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6245;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6245 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
+(6245,0,0,0,11,0,100,0,0,0,0,0,17,333,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anathera - On Respawn - Set Emote State 333");
+
+-- Latherion
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6246;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6246 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=624600 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
+(6246,0,0,0,11,0,100,0,0,0,0,0,17,333,0,0,0,0,0,1,0,0,0,0,0,0,0,"Latherion - On Respawn - Set Emote State 333"),
+(6246,0,1,0,38,0,100,0,1,1,0,0,80,624600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Latherion - On Data Set - Run Script"),
+(624600,9,0,0,0,0,100,0,0,0,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Latherion - On Script - Set Emote State 0"),
+(624600,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,0.623109,"Latherion - On Script - Set Orientation"),
+(624600,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Latherion - On Script - Say Line 0"),
+(624600,9,3,0,0,0,100,0,3000,3000,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Latherion - On Script - Set Flag Standstate 'Kneel'");
+
+-- Texts
+DELETE FROM `creature_text` WHERE `CreatureID` IN (6244,6245,6246);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6244,0,0,"A thousand years ago, the immortal elves, demigods of the forest and dragons fought against the Legion on the slopes of Hyjal.",12,7,100,1,0,0,2310,0,"Takar the Seer"),
+(6244,1,0,"Anathera and Latherion fought back to back where the battle was thickest. Two lovers determined to survive the war together.",12,7,100,1,0,0,2311,0,"Takar the Seer"),
+(6244,2,0,"But it was not to be. As their foes pressed close, Anathera's armor was pierced by a demon's tainted blade. In the thick of battle, there would be nothing to save her.",12,7,100,1,0,0,2312,0,"Takar the Seer"),
+(6244,3,0,"Ignoring the battle that raged about him, Latherion dropped his guard to cradle his love in her dying moments. But the demons gave him no quarter, and quickly laid him low.",12,7,100,1,0,0,2314,0,"Takar the Seer"),
+(6244,4,0,"Where the two lovers fell, a tree would bloom. The elves call it the heartswood. It will surely serve your ends.",12,7,100,1,0,0,2317,0,"Takar the Seer"),
+(6245,0,0,"So this... this is how it ends, my love...",12,7,100,0,0,0,2316,0,"Anathera"),
+(6246,0,0,"Anathera!",12,7,100,15,0,0,2313,0,"Latherion"),
+(6246,1,0,"Anathera... I cannot bear to face the rest of eternity without you by my side... If you are taken from me, then let this be the day I also return to the earth...",12,7,100,0,0,0,2315,0,"Latherion");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_05_world_from_335_was_2018_03_17_05_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_05_world_from_335_was_2018_03_17_05_world_335.sql
new file mode 100644
index 00000000000..62d0da16a3c
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_05_world_from_335_was_2018_03_17_05_world_335.sql
@@ -0,0 +1,4 @@
+/*
+-- Blood Elf rogue quest Greed (ID 9491)
+UPDATE `quest_offer_reward` SET `RewardText`="This is the ring, is it? Not much to look at, but you know what they say about one elves' trash...$B$BAnd let's not forget your payment. Don't feel shy about spending it right here sweetie!" WHERE `ID`=9491;
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_06_world_from_335_was_2018_03_18_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_06_world_from_335_was_2018_03_18_00_world_335.sql
new file mode 100644
index 00000000000..ac6cff4d149
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_06_world_from_335_was_2018_03_18_00_world_335.sql
@@ -0,0 +1 @@
+-- UPDATE `spell_group_stack_rules` SET `stack_rule`=3 WHERE `group_id`=1105;
diff --git a/sql/updates/world/4.3.4/2018_03_29_07_world_from_335_was_2018_03_20_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_07_world_from_335_was_2018_03_20_00_world_335.sql
new file mode 100644
index 00000000000..923dc0848be
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_07_world_from_335_was_2018_03_20_00_world_335.sql
@@ -0,0 +1,6 @@
+/*
+-- quest 'The Shattered Hand (2)' (ID 1858)
+UPDATE `quest_offer_reward`
+ SET `RewardText`="Hmmm, now this is interesting. You've more than proved your worth with this, $n. I am quite impressed. Consider yourself the newest member of the Shattered Hand. And take this, it will be a great help to you in the future, I think."
+ WHERE `ID`=1858;
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_08_world_from_335_was_2018_03_21_00_world.sql b/sql/updates/world/4.3.4/2018_03_29_08_world_from_335_was_2018_03_21_00_world.sql
new file mode 100644
index 00000000000..d5a36cd23dd
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_08_world_from_335_was_2018_03_21_00_world.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `flags_extra` = (`flags_extra` & ~0x1000);
+UPDATE `creature_template` SET `flags_extra` = (`flags_extra` | 0x1000) WHERE `entry` = 27914;
diff --git a/sql/updates/world/4.3.4/2018_03_29_09_world_from_335_was_2018_03_21_01_world.sql b/sql/updates/world/4.3.4/2018_03_29_09_world_from_335_was_2018_03_21_01_world.sql
new file mode 100644
index 00000000000..00f9b4f00b7
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_09_world_from_335_was_2018_03_21_01_world.sql
@@ -0,0 +1,4 @@
+-- 
+UPDATE `smart_scripts` SET `target_type`=23 WHERE `entryorguid`=21926 AND `source_type`=0 AND `id`=4 AND `link`=5;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (20635,20771) AND `source_type`=0 AND `id`=3 AND `target_type`=12;
+UPDATE `smart_scripts` SET `id`=3 WHERE `entryorguid` IN (20635,20771) AND `source_type`=0 AND `id`=4 AND `action_type`=80;
diff --git a/sql/updates/world/4.3.4/2018_03_29_10_world_from_335_was_2018_03_21_02_world.sql b/sql/updates/world/4.3.4/2018_03_29_10_world_from_335_was_2018_03_21_02_world.sql
new file mode 100644
index 00000000000..3c054070129
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_10_world_from_335_was_2018_03_21_02_world.sql
@@ -0,0 +1,3 @@
+-- 
+UPDATE `smart_scripts` SET `event_param1`=8, `event_param2`=1 WHERE `entryorguid`=26096 AND `source_type`=0 AND `id`=3;
+UPDATE `smart_scripts` SET `event_type`=40 WHERE `entryorguid` IN (-102329,-102341,-102330,-102328,-102326,-102333,-102327) AND `source_type`=0 AND `id`=3;
diff --git a/sql/updates/world/4.3.4/2018_03_29_11_world_from_335_was_2018_03_23_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_11_world_from_335_was_2018_03_23_00_world_335.sql
new file mode 100644
index 00000000000..dce5449460f
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_11_world_from_335_was_2018_03_23_00_world_335.sql
@@ -0,0 +1,6 @@
+/*
+-- Fix spawn location for undead
+UPDATE `playercreateinfo` SET `position_x` = 1676.349976, `position_y` = 1677.449951, `position_z` = 121.669998, `orientation` = 2.705260 WHERE `race` = 5 AND `zone`=85;
+-- Fix spawn location for night elf
+UPDATE `playercreateinfo` SET `position_x` = 10311.299805, `position_y` = 831.463013, `position_z` = 1326.410034, `orientation` = 5.480334 WHERE `race` = 4 AND `zone`=141;
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_12_world_from_335_was_2018_03_23_01_world.sql b/sql/updates/world/4.3.4/2018_03_29_12_world_from_335_was_2018_03_23_01_world.sql
new file mode 100644
index 00000000000..10a242cdfc9
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_12_world_from_335_was_2018_03_23_01_world.sql
@@ -0,0 +1,8 @@
+-- Warsong Marksman (ID 25244) corpses on Garrosh's Landing should appear dead in-game, both in portrait and NPC name
+UPDATE `creature_addon` SET `bytes1`=0,`auras`='29266' WHERE `guid` IN (110545,110546); -- 2x Warsong Marksman in burning heap of corpses
+UPDATE `creature_addon` SET `bytes1`=0,`bytes2`=2,`auras`='29266' WHERE `guid` IN (110540,110541,110544,110547,110551,110552,110553,110554); -- scattered Marksman corpses with ranged weapon
+UPDATE `creature` SET `unit_flags`=`unit_flags`|537133824 WHERE `guid` IN (110552, 110547, 110541, 110554, 110545, 110546, 110553, 110544, 110551, 110540, 110370, 110378);
+-- Garhal minions
+DELETE FROM `creature_addon` WHERE `guid` IN (118803, 118804);
+INSERT INTO `creature_addon` (`guid`,`bytes1`,`bytes2`) VALUES
+(118803,0,0),(118804,0,0);
diff --git a/sql/updates/world/4.3.4/2018_03_29_13_world_from_335_was_2018_03_23_02_world.sql b/sql/updates/world/4.3.4/2018_03_29_13_world_from_335_was_2018_03_23_02_world.sql
new file mode 100644
index 00000000000..bf043e88baa
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_13_world_from_335_was_2018_03_23_02_world.sql
@@ -0,0 +1,2 @@
+UPDATE `access_requirement` SET `quest_done_A`=10277, `quest_done_H`=10277, `quest_failed_text`="You must complete the quest ""The Caverns of Time"" before entering Old Hillsbrad Foothills" WHERE `MapID` IN (560) AND `difficulty`=0;
+UPDATE `access_requirement` SET `quest_done_A`=10277, `quest_done_H`=10277, `quest_failed_text`="You must complete the quest ""The Caverns of Time"" and be level 70 before entering the Heroic difficulty of Old Hillsbrad Foothills" WHERE `MapID` IN (560) AND `difficulty`=1;
diff --git a/sql/updates/world/4.3.4/2018_03_29_14_world_from_335_was_2018_03_23_03_world.sql b/sql/updates/world/4.3.4/2018_03_29_14_world_from_335_was_2018_03_23_03_world.sql
new file mode 100644
index 00000000000..f5c6953bd8c
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_14_world_from_335_was_2018_03_23_03_world.sql
@@ -0,0 +1,10 @@
+-- 
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (1814603,1814604) AND `source_type`=9 AND `id`>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
+(1814603,9,2,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,19,16222,10,0,0,0,0,0,'Champion Vranesh - Script 3 - Silvermoon City Guardian say 2'),
+(1814604,9,2,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,19,16222,10,0,0,0,0,0,'Champion Vranesh - Script 3 - Silvermoon City Guardian say 3');
+
+DELETE FROM `creature_text` WHERE `CreatureID`=16222 AND `GroupID`>1;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(16222,2,0,"Even the Light is no match for the indomitable will of our people.",12,1,100,0,0,0,14793,0,"Silvermoon City Guardian"),
+(16222,3,0,"Your power strengthens us all.",12,1,100,0,0,0,14792,0,"Silvermoon City Guardian");
diff --git a/sql/updates/world/4.3.4/2018_03_29_15_world_from_335_was_2018_03_27_00_world.sql b/sql/updates/world/4.3.4/2018_03_29_15_world_from_335_was_2018_03_27_00_world.sql
new file mode 100644
index 00000000000..ad6f5cf8abe
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_15_world_from_335_was_2018_03_27_00_world.sql
@@ -0,0 +1,6 @@
+-- 
+UPDATE `quest_template_addon` SET `PrevQuestID`=10956 WHERE `ID`=10968;
+DELETE FROM `creature_queststarter` WHERE `quest` IN (10968);
+DELETE FROM `game_event_creature_quest` WHERE `quest` IN (10968);
+INSERT INTO `game_event_creature_quest` (`eventEntry`, `id`, `quest`) VALUES
+(10,17538,10968);
diff --git a/sql/updates/world/4.3.4/2018_03_29_16_world_from_335_was_2018_03_27_01_world.sql b/sql/updates/world/4.3.4/2018_03_29_16_world_from_335_was_2018_03_27_01_world.sql
new file mode 100644
index 00000000000..617f7d50af9
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_16_world_from_335_was_2018_03_27_01_world.sql
@@ -0,0 +1,4 @@
+-- 
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (19216) AND `source_type`=0 AND `id`=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
+(19216,0,1,0,25,0,100,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grand Anchorite Almonen - On reset - set run off");
diff --git a/sql/updates/world/4.3.4/2018_03_29_17_world_from_335_was_2018_03_27_02_world.sql b/sql/updates/world/4.3.4/2018_03_29_17_world_from_335_was_2018_03_27_02_world.sql
new file mode 100644
index 00000000000..0793d7ec4a2
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_17_world_from_335_was_2018_03_27_02_world.sql
@@ -0,0 +1,8 @@
+-- 
+-- Fix prerequisite for quest "Feathers for Nafien"
+UPDATE `quest_template_addon` SET `PrevQuestID`=8461 WHERE `ID`=8467;
+
+-- Fix prerequisite for quest "Speak to Salfa"
+DELETE FROM `quest_template_addon` WHERE `ID`=8465;
+INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
+(8465,0,0,0,8461,0,0,0,0,0,0,0,0,0,0,0,0);
diff --git a/sql/updates/world/4.3.4/2018_03_29_18_world_from_335_was_2018_03_27_03_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_18_world_from_335_was_2018_03_27_03_world_335.sql
new file mode 100644
index 00000000000..e43d7449bda
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_18_world_from_335_was_2018_03_27_03_world_335.sql
@@ -0,0 +1,8 @@
+/*
+-- 
+-- Dreka'Sur --> Add Gossip Text
+UPDATE `creature_template` SET `gossip_menu_id`=4067 WHERE `entry`=9620;
+DELETE FROM `gossip_menu` WHERE `MenuID`=4067;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(4067,4960,0);
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_19_world_from_335_was_2018_03_27_04_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_19_world_from_335_was_2018_03_27_04_world_335.sql
new file mode 100644
index 00000000000..f085dd45adb
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_19_world_from_335_was_2018_03_27_04_world_335.sql
@@ -0,0 +1,19 @@
+/*
+-- Henze Faulk
+DELETE FROM `creature_text` WHERE `CreatureID`=6172 AND `GroupID`=1;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6172,1,0,"Good luck to you, $n. And don't forget... get that script before finding Gazin.",12,7,100,0,0,0,2353,0,"Henze Faulk");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6172 AND `source_type`=0 AND `id`=4;
+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
+(6172,0,4,0,19,0,100,0,1787,0,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Henze Faulk - On Quest 'The Tome of Divinity (Part 7)' Taken - Say Line 1");
+
+-- Narm Faulk
+DELETE FROM `creature_text` WHERE `CreatureID`=6177 AND `GroupID`=1;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6177,1,0,"Good luck, $n. And remember, find Muiredon once you've accomplished the task.",12,6,100,0,0,0,2351,0,"Narm Faulk");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6177 AND `source_type`=0 AND `id`=4;
+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
+(6177,0,4,0,19,0,100,0,1784,0,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Narm Faulk - On Quest 'The Tome of Divinity (Part 7)' Taken - Say Line 1");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_20_world_from_335_was_2018_03_27_05_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_20_world_from_335_was_2018_03_27_05_world_335.sql
new file mode 100644
index 00000000000..7badf15caf0
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_20_world_from_335_was_2018_03_27_05_world_335.sql
@@ -0,0 +1,19 @@
+/*
+-- Yorus Barleybrew
+DELETE FROM `creature_text` WHERE `CreatureID`=6166;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6166,0,0,"$n ran the Gauntlet!  Three cheers for $n!",12,7,100,22,0,0,2308,0,"Yorus Barleybrew"),
+(6166,1,0,"Hip hip, hoorah!",12,7,100,4,0,0,2309,0,"Yorus Barleybrew");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6166;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6166 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=616600 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
+(6166,0,0,0,20,0,100,0,1699,0,0,0,80,616600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Quest 'The Rethban Gauntlet' Finished - Run Script"),
+(616600,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,"Yorus Barleybrew - On Script - Remove Npc Flag Questgiver"),
+(616600,9,1,0,0,0,100,0,500,500,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Script - Say Line 0"),
+(616600,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Script - Say Line 1"),
+(616600,9,3,0,0,0,100,0,3500,3500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Script - Say Line 1"),
+(616600,9,4,0,0,0,100,0,3500,3500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Script - Say Line 1"),
+(616600,9,5,0,0,0,100,0,3000,3000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Script - Add Npc Flag Questgiver");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_21_world_from_335_was_2018_03_27_06_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_21_world_from_335_was_2018_03_27_06_world_335.sql
new file mode 100644
index 00000000000..5dbabe218ce
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_21_world_from_335_was_2018_03_27_06_world_335.sql
@@ -0,0 +1,11 @@
+/*
+-- Muren Stormpike
+DELETE FROM `creature_text` WHERE `CreatureID`=6114;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6114,0,0,"Farewell, $n.  And remember, a warrior never shows his back to his foe!",12,0,100,66,0,0,2302,0,"Muren Stormpike");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6114;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6114 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
+(6114,0,0,0,19,0,100,0,1680,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Muren Stormpike - On Quest 'Tormus Deepforge' Taken - Say Line 0");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_22_world_from_335_was_2018_03_27_07_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_22_world_from_335_was_2018_03_27_07_world_335.sql
new file mode 100644
index 00000000000..61adc40b284
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_22_world_from_335_was_2018_03_27_07_world_335.sql
@@ -0,0 +1,38 @@
+/*
+-- Furen Longbeard
+DELETE FROM `creature_text` WHERE `CreatureID`=5413;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5413,0,0,"%s begins to work...",16,0,100,0,0,0,2341,0,"Furen Longbeard"),
+(5413,1,0,"Finished!  And the results are amazing.  I must convey them to my associates Grimand, Mathiel and Klockmort!",12,7,100,4,0,0,2342,0,"Furen Longbeard"),
+(5413,2,0,"Your armor is ready, $n.",12,7,100,1,0,0,2343,0,"Furen Longbeard");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5413;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5413 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (541300,541301,541302) 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
+(5413,0,0,0,20,0,100,0,1701,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Quest 'Fire Hardened Mail' Finished - Remove Npc Flag Questgiver"),
+(5413,0,1,0,20,0,100,0,1701,0,0,0,53,0,5413,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Quest 'Fire Hardened Mail' Finished - Start Waypoint"),
+(5413,0,2,0,40,0,100,0,1,5413,0,0,80,541300,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Waypoint 1 Reached - Run Script"),
+(5413,0,3,0,40,0,100,0,2,5413,0,0,80,541301,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Waypoint 2 Reached - Run Script"),
+(5413,0,4,0,40,0,100,0,4,5413,0,0,80,541302,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Waypoint 4 Reached - Run Script"),
+(541300,9,0,0,0,0,100,0,0,0,0,0,54,16000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Pause Waypoint"),
+(541300,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,0.190955,"Furen Longbeard - On Script - Set Orientation"),
+(541300,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Say Line 0"),
+(541300,9,3,0,0,0,100,0,0,0,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Set Emote State 233"),
+(541300,9,4,0,0,0,100,0,15000,15000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Set Emote State 0"),
+(541301,9,0,0,0,0,100,0,0,0,0,0,54,26000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Pause Waypoint"),
+(541301,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,0.38748,"Furen Longbeard - On Script - Set Orientation"),
+(541301,9,2,0,0,0,100,0,1000,1000,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Set Emote State 233"),
+(541301,9,3,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Set Emote State 0"),
+(541301,9,4,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Say Line 1"),
+(541302,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,3.281,"Furen Longbeard - On Script - Set Orientation"),
+(541302,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Say Line 2"),
+(541302,9,2,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Furen Longbeard - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `waypoints` WHERE `entry`=5413;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(5413,1,-8427.86,607.066,95.0986,""),
+(5413,2,-8426.26,613.757,95.269,""),
+(5413,3,-8428.98,607.758,95.1228,""),
+(5413,4,-8427,600.092,94.706,"");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_23_world_from_335_was_2018_03_27_08_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_23_world_from_335_was_2018_03_27_08_world_335.sql
new file mode 100644
index 00000000000..f5fa4335f97
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_23_world_from_335_was_2018_03_27_08_world_335.sql
@@ -0,0 +1,20 @@
+/*
+-- Grimand Elmore
+DELETE FROM `creature_text` WHERE `CreatureID`=1416 AND `GroupID` IN (2,3);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(1416,2,0,"%s begins to work...",16,0,100,0,0,0,2346,0,"Grimand Elmore"),
+(1416,3,0,"Amazing!  It worked!  $n, I have your armor.",12,7,100,5,0,0,2347,0,"Grimand Elmore");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1416 AND `source_type`=0 AND `id`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=141601 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
+(1416,0,1,0,20,0,100,0,1705,0,0,0,80,141601,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Quest 'Burning Blood' Finished - Run Script"),
+(141601,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Script - Remove Npc Flag Questgiver+Gossip"),
+(141601,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,3.72935,"Grimand Elmore - On Script - Set Orientation"),
+(141601,9,2,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Script - Say Line 2"),
+(141601,9,3,0,0,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Script - Set Emote State 233"),
+(141601,9,4,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Script - Set Emote State 0"),
+(141601,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.286,"Grimand Elmore - On Script - Set Orientation"),
+(141601,9,6,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Script - Say Line 3"),
+(141601,9,7,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Script - Add Npc Flag Questgiver+Gossip");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_24_world_from_335_was_2018_03_27_09_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_24_world_from_335_was_2018_03_27_09_world_335.sql
new file mode 100644
index 00000000000..824291f27a4
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_24_world_from_335_was_2018_03_27_09_world_335.sql
@@ -0,0 +1,20 @@
+/*
+-- Mathiel
+DELETE FROM `creature_text` WHERE `CreatureID`=6142 AND `GroupID` IN (2,3);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6142,2,0,"%s begins to work...",16,0,100,0,0,0,2348,0,"Mathiel"),
+(6142,3,0,"It is done.  $n, your armor is ready.",12,7,100,1,0,0,2349,0,"Mathiel");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6142 AND `source_type`=0 AND `id`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=614201 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
+(6142,0,1,0,20,0,100,0,1710,0,0,0,80,614201,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Quest 'Sunscorched Shells' Finished - Run Script"),
+(614201,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,"Mathiel - On Script - Remove Npc Flag Questgiver"),
+(614201,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,0.166394,"Mathiel - On Script - Set Orientation"),
+(614201,9,2,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Say Line 2"),
+(614201,9,3,0,0,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Set Emote State 233"),
+(614201,9,4,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Set Emote State 0"),
+(614201,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.71042,"Mathiel - On Script - Set Orientation"),
+(614201,9,6,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Say Line 3"),
+(614201,9,7,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Add Npc Flag Questgiver");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_25_world_from_335_was_2018_03_27_10_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_25_world_from_335_was_2018_03_27_10_world_335.sql
new file mode 100644
index 00000000000..8ba984d2014
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_25_world_from_335_was_2018_03_27_10_world_335.sql
@@ -0,0 +1,31 @@
+/*
+-- Klockmort Spannerspan
+DELETE FROM `creature_text` WHERE `CreatureID`=6169;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6169,0,0,"%s begins to work...",16,0,100,0,0,0,2344,0,"Klockmort Spannerspan"),
+(6169,1,0,"Hooray hooray! $n! It's done!",12,7,100,4,0,0,2345,0,"Klockmort Spannerspan");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6169;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6169 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (616900,616901) 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
+(6169,0,0,0,20,0,100,0,1708,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Quest 'Iron Coral' Finished - Remove Npc Flag Questgiver"),
+(6169,0,1,0,20,0,100,0,1708,0,0,0,53,0,6169,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Quest 'Iron Coral' Finished - Start Waypoint"),
+(6169,0,2,0,40,0,100,0,1,6169,0,0,80,616900,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Waypoint 1 Reached - Run Script"),
+(6169,0,3,0,40,0,100,0,2,6169,0,0,80,616901,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Waypoint 2 Reached - Run Script"),
+(616900,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,"Klockmort Spannerspan - On Script - Pause Waypoint"),
+(616900,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,2.97526,"Klockmort Spannerspan - On Script - Set Orientation"),
+(616900,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Script - Say Line 0"),
+(616900,9,3,0,0,0,100,0,0,0,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Script - Set Emote State 233"),
+(616900,9,4,0,0,0,100,0,10000,10000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Script - Set Emote State 0"),
+(616901,9,0,0,0,0,100,0,1000,1000,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Script - Set Emote State 233"),
+(616901,9,1,0,0,0,100,0,15000,15000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Script - Set Emote State 0"),
+(616901,9,2,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Script - Say Line 1"),
+(616901,9,3,0,0,0,100,0,4000,4000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.62512,"Klockmort Spannerspan - On Script - Set Orientation"),
+(616901,9,4,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klockmort Spannerspan - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `waypoints` WHERE `entry`=6169;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(6169,1,-4815,-1250.3,501.915,""),
+(6169,2,-4812.48,-1250.62,502.014,"");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_26_world_from_335_was_2018_03_27_11_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_26_world_from_335_was_2018_03_27_11_world_335.sql
new file mode 100644
index 00000000000..9cb692b18cb
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_26_world_from_335_was_2018_03_27_11_world_335.sql
@@ -0,0 +1,29 @@
+/*
+-- Tormus Deepforge
+DELETE FROM `creature_text` WHERE `CreatureID`=6031;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6031,0,0,"%s begins to work...",16,0,100,0,0,0,2303,0,"Tormus Deepforge"),
+(6031,1,0,"$n!  I'm finished!",12,7,100,1,0,0,2304,0,"Tormus Deepforge");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6031;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6031 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (603100,603101) 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
+(6031,0,0,0,20,0,100,0,1681,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Quest 'Ironband's Compound' Finished - Remove Npc Flag Questgiver"),
+(6031,0,1,0,20,0,100,0,1681,0,0,0,53,0,6031,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Quest 'Ironband's Compound' Finished - Start Waypoint"),
+(6031,0,2,0,40,0,100,0,1,6031,0,0,80,603100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Waypoint 1 Reached - Run Script"),
+(6031,0,3,0,40,0,100,0,2,6031,0,0,80,603101,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Waypoint 2 Reached - Run Script"),
+(603100,9,0,0,0,0,100,0,0,0,0,0,54,21000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Script - Pause Waypoint"),
+(603100,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.00425,"Tormus Deepforge - On Script - Set Orientation"),
+(603100,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Script - Say Line 0"),
+(603100,9,3,0,0,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Script - Set Emote State 233"),
+(603100,9,4,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Script - Set Emote State 0"),
+(603101,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,4.60767,"Tormus Deepforge - On Script - Set Orientation"),
+(603101,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Script - Say Line 1"),
+(603101,9,2,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tormus Deepforge - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `waypoints` WHERE `entry`=6031;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(6031,1,-4798.04,-1104.75,499.605,""),
+(6031,2,-4793.38,-1098.17,498.89,"");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_27_world_from_335_was_2018_03_27_12_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_27_world_from_335_was_2018_03_27_12_world_335.sql
new file mode 100644
index 00000000000..b3744ce7be5
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_27_world_from_335_was_2018_03_27_12_world_335.sql
@@ -0,0 +1,41 @@
+/*
+-- Donova Snowden
+DELETE FROM `creature_text` WHERE `CreatureID`=9298 AND `GroupID` IN (3,4,5,6,7,8);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(9298,3,0,"Please, follow me.",12,0,100,0,0,0,6153,0,"Donova Snowden"),
+(9298,4,0,"I haven't really figured out what it is, but there's something strange about the hot springs...",12,0,100,0,0,0,6154,0,"Donova Snowden"),
+(9298,5,0,"%s tosses the sword into the shallow pool.",16,0,100,61,0,0,6155,0,"Donova Snowden"),
+(9298,6,0,"I've found that when I throw something into this water, it has improved incredibly when I retrieve it.",12,0,100,0,0,0,6156,0,"Donova Snowden"),
+(9298,7,0,"Well, whatever it is, it works quite well!",12,0,100,0,0,0,6157,0,"Donova Snowden"),
+(9298,8,0,"And I am determined to find out more... So if you need my help again, you know where I'll be.",12,0,100,0,0,0,6158,0,"Donova Snowden");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=9298 AND `source_type`=0 AND `id` IN (3,4,5,6);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (929802,929803,929804,929805) 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
+(9298,0,3,0,20,0,100,0,3908,0,0,0,80,929802,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Quest 'It's a Secret to Everybody (Part 3)' Finished - Run Script"),
+(9298,0,4,0,40,0,100,0,1,929800,0,0,80,929803,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Waypoint 1 Reached - Run Script"),
+(9298,0,5,0,40,0,100,0,1,929801,0,0,80,929804,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Waypoint 1 Reached - Run Script"),
+(9298,0,6,0,40,0,100,0,3,929801,0,0,80,929805,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Waypoint 3 Reached - Run Script"),
+(929802,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Remove Npc Flag Questgiver+Gossip"),
+(929802,9,1,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Say Line 3"),
+(929802,9,2,0,0,0,100,0,3000,3000,0,0,53,1,929800,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Start Waypoint"),
+(929803,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.91764,"Donova Snowden - On Script - Set Orientation"),
+(929803,9,1,0,0,0,100,0,1000,1000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Say Line 4"),
+(929803,9,2,0,0,0,100,0,4000,4000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Say Line 5"),
+(929803,9,3,0,0,0,100,0,3000,3000,0,0,53,0,929801,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Start Waypoint"),
+(929804,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,"Donova Snowden - On Script - Pause Waypoint"),
+(929804,9,1,0,0,0,100,0,1000,1000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Say Line 6"),
+(929804,9,2,0,0,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Set Flag Standstate 'Kneel'"),
+(929804,9,3,0,0,0,100,0,6000,6000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Remove Flag Standstate 'Kneel'"),
+(929804,9,4,0,0,0,100,0,0,0,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Say Line 7"),
+(929804,9,5,0,0,0,100,0,5000,5000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Say Line 8"),
+(929805,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.63731,"Donova Snowden - On Script - Set Orientation"),
+(929805,9,1,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Donova Snowden - On Script - Add Npc Flag Questgiver+Gossip");
+
+DELETE FROM `waypoints` WHERE `entry` IN (929800,929801);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(929800,1,6370.08,-2523.34,532.122,""),
+(929801,1,6364.47,-2522.52,527.093,""),
+(929801,2,6370.08,-2523.34,532.122,""),
+(929801,3,6395.57,-2536.75,541.548,"");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_28_world_from_335_was_2018_03_27_13_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_28_world_from_335_was_2018_03_27_13_world_335.sql
new file mode 100644
index 00000000000..3d478ad5b4e
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_28_world_from_335_was_2018_03_27_13_world_335.sql
@@ -0,0 +1,2 @@
+-- Item "Furen's Notes"
+-- UPDATE `item_template` SET `maxcount`=3 WHERE `entry`=6926;
diff --git a/sql/updates/world/4.3.4/2018_03_29_29_world_from_335_was_2018_03_27_14_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_29_world_from_335_was_2018_03_27_14_world_335.sql
new file mode 100644
index 00000000000..f2555512fdd
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_29_world_from_335_was_2018_03_27_14_world_335.sql
@@ -0,0 +1,35 @@
+/*
+-- Winna Hazzard
+DELETE FROM `creature_text` WHERE `CreatureID`=9996;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(9996,0,0,"I'm very curious to see what this sample of water will do!",12,0,100,1,0,0,5945,0,"Winna Hazzard"),
+(9996,1,0,"%s pours the corrupted water onto the cat.",16,0,100,16,0,0,5946,0,"Winna Hazzard"),
+(9996,2,0,"Haha! Perfect!",12,0,100,11,0,0,5947,0,"Winna Hazzard");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=9996;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=9996 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=999600 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
+(9996,0,0,0,20,0,100,0,4505,0,0,0,80,999600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winna Hazzard - On Quest 'Well of Corruption' Finished - Run Script"),
+(999600,9,0,0,0,0,100,0,0,0,0,0,36,10658,0,0,0,0,0,19,10657,0,0,0,0,0,0,"Winna Hazzard - On Script - Update Template To 'Winna's Kitten' (Corrupted Cat)"), -- Reset script (in case event was triggered a few seconds before)
+(999600,9,1,0,0,0,100,0,0,0,0,0,3,0,0,0,0,0,0,19,10658,0,0,0,0,0,0,"Winna Hazzard - On Script - Demorph (Winna's Kitten)"), -- Reset script (in case event was triggered a few seconds before)
+(999600,9,2,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winna Hazzard - On Script - Remove Npc Flag Questgiver"),
+(999600,9,3,0,0,0,100,0,0,0,0,0,89,0,0,0,0,0,0,19,10658,0,0,0,0,0,0,"Winna Hazzard - On Script - Stop Random Movement (Winna's Kitten)"),
+(999600,9,4,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winna Hazzard - On Script - Say Line 0"),
+(999600,9,5,0,0,0,100,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winna Hazzard - On Script - Set Run On"),
+(999600,9,6,0,0,0,100,0,0,0,0,0,29,0,0,0,0,0,0,19,10658,0,0,0,0,0,0,"Winna Hazzard - On Script - Start Follow"),
+(999600,9,7,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winna Hazzard - On Script - Say Line 1"),
+(999600,9,8,0,0,0,100,0,3000,3000,0,0,36,10657,0,0,0,0,0,19,10658,0,0,0,0,0,0,"Winna Hazzard - On Script - Update Template To 'Corrupted Cat' (Winna's Kitten)"),
+(999600,9,9,0,0,0,100,0,0,0,0,0,86,16510,0,19,10657,0,0,1,0,0,0,0,0,0,0,"Winna Hazzard - On Script - Cross Cast 'Corrupted Saber Visual (DND)'"),
+(999600,9,10,0,0,0,100,0,0,0,0,0,3,10657,0,0,0,0,0,19,10657,0,0,0,0,0,0,"Winna Hazzard - On Script - Morph to Entry 'Corrupted Cat' (Winna's Kitten)"),
+(999600,9,11,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winna Hazzard - On Script - Say Line 2"),
+(999600,9,12,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,5126.82,-325.127,358.926,0,"Winna Hazzard - On Script - Move to Position"),
+(999600,9,13,0,0,0,100,0,0,0,0,0,89,8,0,0,0,0,0,19,10657,0,0,0,0,0,0,"Winna Hazzard - On Script - Start Random Movement (Winna's Kitten)"),
+(999600,9,14,0,0,0,100,0,4000,4000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.99164,"Winna Hazzard - On Script - Set Orientation"),
+(999600,9,15,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winna Hazzard - On Script - Add Npc Flag Questgiver"),
+(999600,9,16,0,0,0,100,0,60000,60000,0,0,36,10658,0,0,0,0,0,19,10657,0,0,0,0,0,0,"Winna Hazzard - On Script - Update Template To 'Winna's Kitten' (Corrupted Cat)"), -- Reset script
+(999600,9,17,0,0,0,100,0,0,0,0,0,3,0,0,0,0,0,0,19,10658,0,0,0,0,0,0,"Winna Hazzard - On Script - Demorph (Winna's Kitten)"); -- Reset script
+
+-- Fix position and add random movement for Winna's Kitten
+UPDATE `creature` SET `position_x`=5126.69, `position_y`=-332.264, `position_z`=356.926, `spawndist`=8, `MovementType`=1 WHERE `guid`=39704;
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_30_world_from_335_was_2018_03_27_15_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_30_world_from_335_was_2018_03_27_15_world_335.sql
new file mode 100644
index 00000000000..740c5921986
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_30_world_from_335_was_2018_03_27_15_world_335.sql
@@ -0,0 +1,402 @@
+/*
+-- Quest "Bathran's Hair"
+DELETE FROM `quest_details` WHERE `ID`=1010;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1010,1,1,6,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=1010;
+
+-- Quest "Elune's Tear"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=1033;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=2 WHERE `ID`=1033;
+
+-- Quest "The Ruins of Stardust"
+DELETE FROM `quest_details` WHERE `ID`=1034;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1034,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=1034;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=2 WHERE `ID`=1034;
+
+-- Quest "Fallen Sky Lake"
+DELETE FROM `quest_details` WHERE `ID`=1035;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1035,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=1035;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=2 WHERE `ID`=1035;
+
+-- Quest "Journey to Stonetalon Peak"
+DELETE FROM `quest_details` WHERE `ID`=1056;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1056,1,1,0,0,0,0,0,0,0);
+
+-- Quest "Raene's Cleansing"
+DELETE FROM `quest_details` WHERE `ID`=991;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(991,1,1,20,0,0,0,0,0,0);
+
+-- Quest "Raene's Cleansing (Part 2)"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=2 WHERE `ID`=1023;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1, `Emote3`=1 WHERE `ID`=1023;
+
+-- Quest "Raene's Cleansing (Part 3)"
+DELETE FROM `quest_details` WHERE `ID`=1024;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1024,1,1,0,0,0,0,0,0,0);
+
+-- Quest "Raene's Cleansing (Part 8)"
+UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=1029;
+
+-- Quest "Raene's Cleansing (Part 9)"
+DELETE FROM `quest_details` WHERE `ID`=1030;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1030,6,1,1,0,0,0,0,0,0);
+
+-- Quest "Raene's Cleansing (Part 10)"
+DELETE FROM `quest_details` WHERE `ID`=1045;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1045,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1045;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1045;
+
+-- Quest "Raene's Cleansing (Part 11)"
+DELETE FROM `quest_details` WHERE `ID`=1046;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1046,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=1046;
+UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=2, `Emote4`=1 WHERE `ID`=1046;
+
+-- Quest "Culling the Threat"
+DELETE FROM `quest_details` WHERE `ID`=1054;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1054,1,1,2,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1054;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=1054;
+
+-- Quest "The Ancient Statuette"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1007;
+
+-- Quest "Ruuzel"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1009;
+
+-- Quest "Elemental Bracers"
+DELETE FROM `quest_details` WHERE `ID`=1016;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1016,66,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1016;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=6 WHERE `ID`=1016;
+
+-- Quest "Mage Summoner"
+DELETE FROM `quest_details` WHERE `ID`=1017;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1017,1,1,5,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1017;
+UPDATE `quest_offer_reward` SET `Emote1`=11, `Emote2`=1 WHERE `ID`=1017;
+
+-- Quest "An Aggressive Defense"
+DELETE FROM `quest_details` WHERE `ID`=1025;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1025,1,1,5,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=1025;
+
+-- Quest "The Zoram Strand"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1008;
+
+-- Quest "Pridewings of Stonetalon"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1134;
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1134;
+
+-- Quest "Kayneth Stillwind"
+DELETE FROM `quest_details` WHERE `ID`=4581;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4581,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=4581;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=4581;
+
+-- Quest "Forsaken Diseases"
+DELETE FROM `quest_details` WHERE `ID`=1011;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1011,1,5,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1011;
+
+-- Quest "Insane Druids"
+DELETE FROM `quest_details` WHERE `ID`=1012;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1012,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1012;
+
+-- Quest "The Howling Vale"
+DELETE FROM `quest_details` WHERE `ID`=1022;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1022,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=1022;
+
+-- Quest "Velinde Starsong"
+DELETE FROM `quest_details` WHERE `ID`=1037;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1037,1,1,0,0,0,0,0,0,0);
+
+-- Quest "Velinde's Effects"
+DELETE FROM `quest_details` WHERE `ID`=1038;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1038,6,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1038;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1038;
+
+-- Quest "The Barrens Port"
+DELETE FROM `quest_details` WHERE `ID`=1039;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1039,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=1039;
+
+-- Quest "The Caravan Road"
+DELETE FROM `quest_details` WHERE `ID`=1041;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1041,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1041;
+
+-- Quest "The Carevin Family"
+DELETE FROM `quest_details` WHERE `ID`=1042;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1042,274,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1042;
+
+-- Quest "The Scythe of Elune"
+DELETE FROM `quest_details` WHERE `ID`=1043;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1043,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1043;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1043;
+
+-- Quest "Answered Questions"
+DELETE FROM `quest_details` WHERE `ID`=1044;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1044,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=2 WHERE `ID`=1044;
+
+-- Quest "A Helping Hand"
+DELETE FROM `quest_details` WHERE `ID`=9533;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9533,1,274,1,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=9533;
+
+-- Quest "A Shameful Waste"
+DELETE FROM `quest_details` WHERE `ID`=9517;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9517,1,0,0,0,0,0,0,0,0);
+
+-- Quest "The Lost Chalice"
+DELETE FROM `quest_details` WHERE `ID`=9519;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9519,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=9519;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9519;
+
+-- Quest "Destroy the Legion"
+DELETE FROM `quest_details` WHERE `ID`=9516;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9516,5,1,25,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=9516;
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=9516;
+
+-- Quest "Diabolical Plans"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=9520;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=274 WHERE `ID`=9520;
+
+-- Quest "Never Again!"
+DELETE FROM `quest_details` WHERE `ID`=9522;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9522,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=9522;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=66 WHERE `ID`=9522;
+
+-- Quest "Agents of Destruction"
+DELETE FROM `quest_details` WHERE `ID`=9518;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9518,1,5,25,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=11, `Emote2`=5, `Emote3`=6 WHERE `ID`=9518;
+
+-- Quest "Report from the Northern Front"
+DELETE FROM `quest_details` WHERE `ID`=9521;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9521,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=9521;
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=9521;
+
+-- Quest "Supplies to Auberdine"
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=976;
+
+-- Quest "In Search of Thaelrid"
+DELETE FROM `quest_details` WHERE `ID`=1198;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1198,1,1,0,0,0,0,0,0,0);
+
+-- Quest "Twilight Falls"
+DELETE FROM `quest_details` WHERE `ID`=1199;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1199,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1199;
+UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=1199;
+
+-- Quest "Blackfathom Villainy"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1200;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=66 WHERE `ID`=1200;
+
+-- Quest "The Tower of Althalaxx (Part 2)"
+UPDATE `quest_details` SET `Emote2`=1 WHERE `ID`=966;
+UPDATE `quest_offer_reward` SET `Emote2`=1, `Emote3`=5 WHERE `ID`=966;
+
+-- Quest "The Tower of Althalaxx (Part 3)"
+UPDATE `quest_details` SET `Emote2`=1 WHERE `ID`=967;
+
+-- Quest "The Tower of Althalaxx (Part 6)"
+UPDATE `quest_details` SET `Emote2`=1, `Emote3`=1 WHERE `ID`=1140;
+
+-- Quest "The Tower of Althalaxx (Part 7)"
+DELETE FROM `quest_details` WHERE `ID`=1167;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1167,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote2`=1, `Emote3`=6 WHERE `ID`=1167;
+
+-- Quest "The Tower of Althalaxx (Part 8)"
+UPDATE `quest_details` SET `Emote2`=1 WHERE `ID`=1143;
+
+-- Quest "The Tower of Althalaxx (Part 9)"
+DELETE FROM `quest_details` WHERE `ID`=981;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(981,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote2`=1, `Emote3`=2 WHERE `ID`=981;
+
+-- Quest "Cave Mushrooms"
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=947;
+
+-- Quest "The Corruption Abroad"
+DELETE FROM `quest_details` WHERE `ID`=3765;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(3765,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=3765;
+
+-- Quest "Researching the Corruption"
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=1275;
+
+-- Quest "The Powers Below"
+UPDATE `quest_offer_reward` SET `Emote2`=1, `Emote3`=6 WHERE `ID`=968;
+
+-- Quest "Reclaiming the Charred Vale (Part 2)"
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1059;
+
+-- Quest "On Guard in Stonetalon"
+DELETE FROM `quest_details` WHERE `ID`=1070;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1070,3,6,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=1070;
+
+-- Quest "On Guard in Stonetalon (Part 2)"
+DELETE FROM `quest_details` WHERE `ID`=1085;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1085,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1085;
+
+-- Quest "A Gnome's Respite"
+DELETE FROM `quest_details` WHERE `ID`=1071;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1071,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=1071;
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1071;
+
+-- Quest "A Scroll from Mauren"
+DELETE FROM `quest_details` WHERE `ID`=1075;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1075,1,0,0,0,0,0,0,0,0);
+
+-- Quest "Devils in Westfall"
+DELETE FROM `quest_details` WHERE `ID`=1076;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1076,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1076;
+
+-- Quest "Special Delivery for Gaxim"
+DELETE FROM `quest_details` WHERE `ID`=1077;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1077,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=5 WHERE `ID`=1077;
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=1077;
+
+-- Quest "An Old Colleague"
+DELETE FROM `quest_details` WHERE `ID`=1072;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1072,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=1072;
+
+-- Quest "Ineptitude + Chemicals = Fun"
+DELETE FROM `quest_details` WHERE `ID`=1073;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1073,11,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1073;
+UPDATE `quest_offer_reward` SET `Emote1`=273, `Emote2`=1 WHERE `ID`=1073;
+
+-- Quest "Ineptitude + Chemicals = Fun (Part 2)"
+DELETE FROM `quest_details` WHERE `ID`=1074;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1074,1,11,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1074;
+UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=1074;
+
+-- Quest "Covert Ops - Alpha"
+DELETE FROM `quest_details` WHERE `ID`=1079;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1079,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1079;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1079;
+
+-- Quest "Covert Ops - Beta"
+DELETE FROM `quest_details` WHERE `ID`=1080;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1080,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1080;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1080;
+
+-- Quest "Kaela's Update"
+DELETE FROM `quest_details` WHERE `ID`=1091;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1091,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=1091;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=1091;
+
+-- Quest "Enraged Spirits"
+DELETE FROM `quest_details` WHERE `ID`=1083;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1083,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1083;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=1083;
+
+-- Quest "Enraged Spirits"
+DELETE FROM `quest_details` WHERE `ID`=1084;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1084,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=1084;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=1084;
+
+-- Quest "Update for Sentinel Thenysil"
+DELETE FROM `quest_details` WHERE `ID`=1082;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1082,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=1082;
+
+-- Quest "Reception from Tyrande"
+DELETE FROM `quest_details` WHERE `ID`=1081;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(1081,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1081;
+
+-- Quest "Castpipe's Task"
+DELETE FROM `quest_details` WHERE `ID`=2931;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(2931,5,1,1,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2931;
+
+-- Quest "Data Rescue"
+DELETE FROM `quest_details` WHERE `ID`=2930;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(2930,5,1,1,6,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=2930;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=2 WHERE `ID`=2930;
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_31_world_from_335_was_2018_03_27_16_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_31_world_from_335_was_2018_03_27_16_world_335.sql
new file mode 100644
index 00000000000..88478c82fb7
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_31_world_from_335_was_2018_03_27_16_world_335.sql
@@ -0,0 +1,7 @@
+/*
+UPDATE `item_template` SET `maxcount`=1 WHERE `entry`=6926;
+UPDATE `quest_template` SET `AllowableRaces`=8 WHERE `ID`=1703;
+UPDATE `quest_template` SET `AllowableRaces`=64 WHERE `ID`=1704;
+UPDATE `quest_template` SET `AllowableRaces`=1|4 WHERE `ID`=1700;
+UPDATE `quest_template_addon` SET `PrevQuestID`=1782 WHERE `ID` IN (1710, 1705, 1708,1703,1704,1700);
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_29_32_world_from_335_was_2018_03_28_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_32_world_from_335_was_2018_03_28_00_world_335.sql
new file mode 100644
index 00000000000..f69adf2bba7
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_29_32_world_from_335_was_2018_03_28_00_world_335.sql
@@ -0,0 +1,5 @@
+/*
+-- Kargath Grunt
+UPDATE `creature_equip_template` SET `ItemID1`=5287 WHERE `CreatureID`=8155;
+UPDATE `creature_addon` SET `bytes2`=1 WHERE `guid`=6898;
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_04_00_world.sql b/sql/updates/world/4.3.4/2018_04_04_00_world.sql
new file mode 100644
index 00000000000..39472300f39
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_04_00_world.sql
@@ -0,0 +1,20 @@
+-- vendor list for entry 44027
+DELETE FROM `npc_vendor` WHERE `entry`= 44027;
+INSERT INTO `npc_vendor`(`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`,`type`,`VerifiedBuild`) VALUES
+(44027, 1, 7005,0,0,0,1,0),
+(44027, 2, 2320,0,0,0,1,0),
+(44027, 3, 2604,0,0,0,1,0),
+(44027, 4, 4289,0,0,0,1,0),
+(44027, 5, 6260,0,0,0,1,0),
+(44027, 6, 2605,0,0,0,1,0),
+(44027, 7, 2321,0,0,0,1,0),
+(44027, 8, 4340,0,0,0,1,0),
+(44027, 9, 4341,0,0,0,1,0),
+(44027,10, 4291,0,0,0,1,0),
+(44027,11, 6261,0,0,0,1,0),
+(44027,12, 2325,0,0,0,1,0),
+(44027,13, 8343,0,0,0,1,0),
+(44027,14, 4342,0,0,0,1,0),
+(44027,15,10290,0,0,0,1,0),
+(44027,16,14341,0,0,0,1,0),
+(44027,17,38426,0,0,0,1,0);
diff --git a/sql/updates/world/4.3.4/2018_04_06_00_world_from_335_was_2018_03_29_00_world.sql b/sql/updates/world/4.3.4/2018_04_06_00_world_from_335_was_2018_03_29_00_world.sql
new file mode 100644
index 00000000000..9288c55e1ed
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_00_world_from_335_was_2018_03_29_00_world.sql
@@ -0,0 +1,441 @@
+-- Duplicates removed
+DELETE FROM creature WHERE guid IN (128989,129260,128975,128971,129421,129426,129420,129422,129419,129429,129418,129430,129427,129431,129425,129428,129424,129423,128961,128951,128952,128950,129000,128992,128983,128955,128969,128933,128941,128931,128954,128972,128960,128926,128981,128912,128977,128978,128929,128979,128914,128987,128918,128944,128994,128995,128942,128993,128945,128964,128917,128956,128943,128996,128916,128940,128965,128930,128963,128928,128970,128982,129001,128953,128920,128922,128973,128966,128913,128968,128937,128938,128967,128915,128976,128932,128980,128947,128921,128958,128959,128911,128984,128962);
+DELETE FROM creature_addon WHERE guid IN (128989,151046,129260,128975,128971,129421,129426,129420,129422,129419,129429,129418,129430,129427,129431,129425,129428,129424,129423,128961,128951,128952,128950,129000,128992,128983,128955,128969,128933,128941,128931,128954,128972,128960,128926,128981,128912,128977,128978,128929,128979,128914,128987,128918,128944,128994,128995,128942,128993,128945,128964,128917,128956,128943,128996,128916,128940,128965,128930,128963,128928,128970,128982,129001,128953,128920,128922,128973,128966,128913,128968,128937,128938,128967,128915,128976,128932,128980,128947,128921,128958,128959,128911,128984,128962);
+-- Saronite Arrow
+DELETE FROM gameobject WHERE guid IN (66149, 66150, 66151, 66153, 66154, 66155, 66157, 66158, 66161, 66163, 66164, 66165, 66166, 66169, 66170, 66171, 66174, 66176, 66177, 66178, 66180, 66182, 66183, 66186, 66188,66194, 66195, 66197, 66201, 66203, 66204, 66208, 66209, 66210, 66211, 66212, 66213, 66219, 66220, 66221, 66222, 66223, 66224, 66225, 66227, 66229, 66231, 66232);
+-- Citizen of Havenshire 
+UPDATE creature SET spawntimesecs = 5 WHERE id IN (28576,28577);
+-- #1
+UPDATE creature SET position_x = 2056.845215, position_y = -5887.278809, position_z = 105.142105, orientation = 5.18, MovementType = 2, spawndist = 0 WHERE guid = 128934;
+DELETE FROM `creature_addon` WHERE `guid` IN (128934);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128934, 1289340, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289340;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289340,1,2056.84,-5887.27,105.142, 0, 1, 0, 100, 0),
+(1289340,2,2057.01,-5896.95,105.123, 0, 1, 0, 100, 0),
+(1289340,3,2035.39,-5906.56,105.121, 0, 1, 0, 100, 0),
+(1289340,4,2017.4, -5907.31,104.623, 0, 1, 0, 100, 0),
+(1289340,5,1975.06,-5904.35,102.864, 0, 1, 0, 100, 0),
+(1289340,6,1945.99,-5904.95,101.207, 0, 1, 0, 100, 0),
+(1289340,7,1917.03,-5911.18,101.617, 0, 1, 0, 100, 0),
+(1289340,8,1903.82,-5909.42,101.736, 0, 1, 0, 100, 0),
+(1289340,9,1877.38,-5911.21,103.984, 0, 1, 0, 100, 0),
+(1289340,10,1827.52,-5927.2,111.352, 0, 1, 0, 100, 0),
+(1289340,11,1813.52,-5931.47,114.61, 0, 1, 0, 100, 0),
+(1289340,12,1807.51,-5941.81,115.80, 0, 1, 0, 100, 0),
+(1289340,13,1807.12,-5972.92,116.18, 0, 1, 0, 100, 0),
+(1289340,14,1807.86,-5991.78,117.61, 0, 1, 0, 100, 0),
+(1289340,15,1810.83,-6000.76,117.63, 2000, 1, 1188, 100, 0);
+-- #2
+UPDATE creature SET spawndist = 0, MovementType = 2 WHERE guid = 128999;
+DELETE FROM `creature_addon` WHERE `guid` IN (128999);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128999, 1289990, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289990;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289990,1,2240.29,-5923.61,98.8092, 0, 1, 0, 100, 0),
+(1289990,2,2225.95,-5917.15,100.564, 0, 1, 0, 100, 0),
+(1289990,3,2183.44,-5892.94,100.710, 0, 1, 0, 100, 0),
+(1289990,4,2165.87,-5868.91,101.326, 0, 1, 0, 100, 0),
+(1289990,5,2144.29,-5833.26,101.282, 0, 1, 0, 100, 0),
+(1289990,6,2134.01,-5800.38,99.6541, 0, 1, 0, 100, 0),
+(1289990,7,2124.79,-5797.24,99.4295, 0, 1, 0, 100, 0),
+(1289990,8,2116.25,-5802.6,100.7940, 2000, 1, 1188, 100, 0);
+-- #3
+UPDATE creature SET position_x = 2279.38, position_y = -5792.860840, position_z = 100.936661, orientation = 2.211558, spawndist = 0, MovementType = 2 WHERE guid = 128957;
+DELETE FROM `creature_addon` WHERE `guid` IN (128957);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128957, 1289570, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289570;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289570,1,2279.38,-5792.86,100.936, 0, 1, 0, 100, 0),
+(1289570,2,2237.48,-5762.68,101.423, 0, 1, 0, 100, 0),
+(1289570,3,2195.92,-5750.89,102.247, 0, 1, 0, 100, 0),
+(1289570,4,2159.98,-5731.86,101.111, 0, 1, 0, 100, 0),
+(1289570,5,2137.79,-5726.60,100.368, 0, 1, 0, 100, 0),
+(1289570,6,2122.49,-5721.89,100.341, 0, 1, 0, 100, 0),
+(1289570,7,2079.47,-5736.64,100.508, 0, 1, 0, 100, 0),
+(1289570,8,2043.49,-5745.04,98.6616, 0, 1, 0, 100, 0),
+(1289570,9,2016.05,-5748.10,99.5260, 0, 1, 0, 100, 0),
+(1289570,10,1980.49,-5754.46,99.502, 0, 1, 0, 100, 0),
+(1289570,11,1945.86,-5764.75,102.86, 0, 1, 0, 100, 0),
+(1289570,12,1917.47,-5769.25,102.56, 0, 1, 0, 100, 0),
+(1289570,13,1898.75,-5770.96,103.71, 0, 1, 0, 100, 0),
+(1289570,14,1862.43,-5790.36,102.18, 0, 1, 0, 100, 0),
+(1289570,15,1825.73,-5806.88,102.91, 0, 1, 0, 100, 0),
+(1289570,16,1797.47,-5813.53,109.97, 0, 1, 0, 100, 0),
+(1289570,17,1769.65,-5813.99,115.93, 0, 1, 0, 100, 0),
+(1289570,18,1752.63,-5817.66,116.12, 0, 1, 0, 100, 0),
+(1289570,19,1747.26,-5809.18,116.12, 0, 1, 0, 100, 0),
+(1289570,20,1748.11,-5802.21,117.12, 2000, 1, 1188, 100, 0);
+-- #4
+UPDATE creature SET position_x = 2260.174805, position_y = -5801.781250, position_z = 102.004921, orientation = 3.76, spawndist = 0, MovementType = 2 WHERE guid = 128948;
+DELETE FROM `creature_addon` WHERE `guid` IN (128948);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128948, 1289480, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289480;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289480,1,2260.17,-5801.78,102.01, 0, 1, 0, 100, 0),
+(1289480,2,2250.01,-5803.18,100.98, 0, 1, 0, 100, 0),
+(1289480,3,2165.42,-5814.7,101.322, 0, 1, 0, 100, 0),
+(1289480,4,2101.6,-5840.02,102.298, 0, 1, 0, 100, 0),
+(1289480,5,2038.31,-5843.82,100.35, 0, 1, 0, 100, 0),
+(1289480,6,1945.59,-5846.08,100.35, 0, 1, 0, 100, 0),
+(1289480,7,1902.9,-5844.42,100.833, 0, 1, 0, 100, 0),
+(1289480,8,1849.54,-5819.23,99.928, 0, 1, 0, 100, 0),
+(1289480,9,1767.95,-5819.02,116.02, 0, 1, 0, 100, 0),
+(1289480,10,1745.79,-5834.48,116.8, 0, 1, 0, 100, 0),
+(1289480,11,1723.42,-5867.11,116.1, 0, 1, 0, 100, 0),
+(1289480,12,1729.19,-5872.37,116.1, 0, 1, 0, 100, 0),
+(1289480,13,1739.22,-5872.44,116.6, 2000, 1, 1188, 100, 0);
+-- #5
+UPDATE creature SET position_x = 2286.046631, position_y = -5829.061035, position_z = 100.934441, orientation = 2.1, spawndist = 0, MovementType = 2 WHERE guid = 128949;
+DELETE FROM `creature_addon` WHERE `guid` IN (128949);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128949, 1289490, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289490;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289490,1,2286.04,-5829.06,100.934, 0, 1, 0, 100, 0),
+(1289490,2,2273.30,-5836.75,100.934, 0, 1, 0, 100, 0),
+(1289490,3,2249.23,-5837.22,101.289, 0, 1, 0, 100, 0),
+(1289490,4,2186.37,-5864.02,101.326, 0, 1, 0, 100, 0),
+(1289490,5,2165.92,-5868.08,101.326, 0, 1, 0, 100, 0),
+(1289490,6,2140.53,-5857.96,101.363, 0, 1, 0, 100, 0),
+(1289490,7,2107.88,-5872.78,103.037, 0, 1, 0, 100, 0),
+(1289490,8,2104.77,-5877.18,103.393, 0, 1, 0, 100, 0),
+(1289490,9,2107.28,-5882.22,103.865, 2000, 1, 1188, 100, 0);
+-- #6
+UPDATE creature SET position_x = 2270.406494, position_y = -5825.929199, position_z = 100.935585, orientation = 2.91, spawndist = 0, MovementType = 2 WHERE guid = 128946;
+DELETE FROM `creature_addon` WHERE `guid` IN (128946);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128946, 1289460, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289460;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289460,1,2270.40,-5825.92,100.935, 0, 1, 0, 100, 0),
+(1289460,2,2235.89,-5826.65,101.323, 0, 1, 0, 100, 0),
+(1289460,3,2211.43,-5824.89,101.391, 0, 1, 0, 100, 0),
+(1289460,4,2161.91,-5813.19,101.513, 0, 1, 0, 100, 0),
+(1289460,5,2112.32,-5785.67,98.9869, 0, 1, 0, 100, 0),
+(1289460,6,2085.38,-5800.41,102.163, 0, 1, 0, 100, 0),
+(1289460,7,2069.57,-5809.84,103.118, 0, 1, 0, 100, 0),
+(1289460,8,2021.36,-5802.96,100.410, 0, 1, 0, 100, 0),
+(1289460,9,1981.07,-5806.64,100.999, 0, 1, 0, 100, 0),
+(1289460,10,1941.97,-5799.79,100.25, 2000, 1, 1188, 100, 0);
+-- #7
+UPDATE creature SET position_x = 2269.964844, position_y = -5826.081055, position_z = 100.936157, orientation = 3.1, spawndist = 0, MovementType = 2 WHERE guid = 128997;
+DELETE FROM `creature_addon` WHERE `guid` IN (128997);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128997, 1289970, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289970;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289970,1,2269.96,-5826.08,100.932, 8000, 1, 0, 100, 0),
+(1289970,2,2236.19,-5803.16,101.208, 0, 1, 0, 100, 0),
+(1289970,3,2167.06,-5816.79,101.337, 0, 1, 0, 100, 0),
+(1289970,4,2105.5,-5839.54,102.1880, 0, 1, 0, 100, 0),
+(1289970,5,2049.9,-5864.14,102.8060, 0, 1, 0, 100, 0),
+(1289970,6,1987.16,-5898.45,102.500, 0, 1, 0, 100, 0),
+(1289970,7,1937.49,-5907.82,101.143, 0, 1, 0, 100, 0),
+(1289970,8,1886.73,-5910.87,103.037, 0, 1, 0, 100, 0),
+(1289970,9,1853.53,-5921.4,105.2080, 0, 1, 0, 100, 0),
+(1289970,10,1812.25,-5927.43,114.55, 0, 1, 0, 100, 0),
+(1289970,11,1768.08,-5923.11,116.12, 0, 1, 0, 100, 0),
+(1289970,12,1761.5,-5930.56,116.119, 0, 1, 0, 100, 0),
+(1289970,13,1742.4,-5967.17,117.122, 2000, 1, 1188, 100, 0);
+-- #8
+UPDATE creature SET position_x = 2258.272461, position_y = -5805.730957, position_z = 100.938576, orientation = 4.38, spawndist = 0, MovementType = 2 WHERE guid = 128998;
+DELETE FROM `creature_addon` WHERE `guid` IN (128998);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128998, 1289980, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289980;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289980,1,2258.27,-5805.73,100.938, 5000, 1, 0, 100, 0),
+(1289980,2,2253.32,-5824.7,101.0520, 0, 1, 0, 100, 0),
+(1289980,3,2232.21,-5831.54,101.341, 0, 1, 0, 100, 0),
+(1289980,4,2196.33,-5826.97,101.406, 0, 1, 0, 100, 0),
+(1289980,5,2140.07,-5816.52,100.652, 0, 1, 0, 100, 0),
+(1289980,6,2126.99,-5799.26,99.5154, 0, 1, 0, 100, 0),
+(1289980,7,2117.59,-5801.23,99.9204, 2000, 1, 1188, 100, 0);
+-- #9
+UPDATE creature SET position_x = 2277.270020, position_y = -5867.498047, position_z = 100.942833, orientation = 1.66, spawndist = 0, MovementType = 2 WHERE guid = 128990;
+DELETE FROM `creature_addon` WHERE `guid` IN (128990);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128990, 1289900, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289900;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289900,1,2277.27,-5867.49,100.942, 7000, 1, 0, 100, 0),
+(1289900,2,2272.55,-5847.26,100.935, 0, 1, 0, 100, 0),
+(1289900,3,2248.3,-5807.73,100.9950, 0, 1, 0, 100, 0),
+(1289900,4,2229.75,-5773.74,101.512, 0, 1, 0, 100, 0),
+(1289900,5,2207.39,-5751.6,102.4630, 0, 1, 0, 100, 0),
+(1289900,6,2162.07,-5722.95,101.576, 0, 1, 0, 100, 0),
+(1289900,7,2144.9,-5704.05,102.2520, 0, 1, 0, 100, 0),
+(1289900,8,2132.24,-5701.09,101.273, 0, 1, 0, 100, 0),
+(1289900,9,2098.18,-5703.38,100.270, 0, 1, 0, 100, 0),
+(1289900,10,2083.12,-5711.63,100.36, 0, 1, 0, 100, 0),
+(1289900,11,2071.02,-5730.28,100.25, 0, 1, 0, 100, 0),
+(1289900,12,2039.03,-5757.86,98.815, 0, 1, 0, 100, 0),
+(1289900,13,2014.79,-5784.96,100.44, 0, 1, 0, 100, 0),
+(1289900,14,2015.79,-5833.84,100.67, 0, 1, 0, 100, 0),
+(1289900,15,2014.32,-5862.64,100.46, 0, 1, 0, 100, 0),
+(1289900,16,2005.57,-5893.96,102.37, 0, 1, 0, 100, 0),
+(1289900,17,1985.4,-5923.43,104.304, 0, 1, 0, 100, 0),
+(1289900,18,1971.35,-5933.44,102.88, 0, 1, 0, 100, 0),
+(1289900,19,1913.35,-5938.29,102.50, 0, 1, 0, 100, 0),
+(1289900,20,1866.07,-5922.39,104.32, 0, 1, 0, 100, 0),
+(1289900,21,1840.94,-5922.4,107.583, 0, 1, 0, 100, 0),
+(1289900,22,1813.25,-5930.15,114.56, 0, 1, 0, 100, 0),
+(1289900,23,1789.73,-5930.3,116.116, 0, 1, 0, 100, 0),
+(1289900,24,1713.48,-5892.5,116.135, 0, 1, 0, 100, 0),
+(1289900,25,1691.18,-5872.74,116.15, 0, 1, 0, 100, 0),
+(1289900,26,1682.69,-5868.98,116.23, 0, 1, 0, 100, 0),
+(1289900,27,1658.57,-5878.73,117.14, 2000, 1, 1188, 100, 0);
+-- #10
+UPDATE creature SET position_x = 2244.684570, position_y = -5863.497070, position_z = 101.023544, orientation = 3.25, spawndist = 0, MovementType = 2 WHERE guid = 128988;
+DELETE FROM `creature_addon` WHERE `guid` IN (128988);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128988, 1289880, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289880;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289880,1,2244.68,-5863.49,101.023, 10000, 1, 0, 100, 0),
+(1289880,2,2236.78,-5865.79,101.105, 0, 1, 0, 100, 0),
+(1289880,3,2176.49,-5844.66,101.348, 0, 1, 0, 100, 0),
+(1289880,4,2143.43,-5844.3,101.3280, 0, 1, 0, 100, 0),
+(1289880,5,2088.85,-5847.07,103.921, 0, 1, 0, 100, 0),
+(1289880,6,2068.05,-5859.08,103.275, 0, 1, 0, 100, 0),
+(1289880,7,2026.17,-5873.86,101.836, 0, 1, 0, 100, 0),
+(1289880,8,1970.37,-5871.27,100.618, 0, 1, 0, 100, 0),
+(1289880,9,1950.31,-5859.67,100.117, 0, 1, 0, 100, 0),
+(1289880,10,1922.59,-5845.54,100.15, 0, 1, 0, 100, 0),
+(1289880,11,1870.15,-5833.8,101.252, 0, 1, 0, 100, 0),
+(1289880,12,1831.83,-5825.1,101.150, 0, 1, 0, 100, 0),
+(1289880,13,1762.85,-5824.3,116.116, 0, 1, 0, 100, 0),
+(1289880,14,1714.55,-5821.33,116.12, 0, 1, 0, 100, 0),
+(1289880,15,1701.84,-5811.57,116.01, 0, 1, 0, 100, 0),
+(1289880,16,1667.87,-5798.99,116.11, 0, 1, 0, 100, 0),
+(1289880,17,1648.39,-5804.74,117.12, 2000, 1, 1188, 100, 0);
+-- #11
+UPDATE creature SET position_x = 2170.995605, position_y = -5910.861816, position_z = 100.466431, orientation = 2.95, spawndist = 0, MovementType = 2 WHERE guid = 128991;
+DELETE FROM `creature_addon` WHERE `guid` IN (128991);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128991, 1289910, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289910;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289910,1,2170.99,-5910.86,100.460, 0, 1, 0, 100, 0),
+(1289910,2,2123.96,-5908.37,103.537, 0, 1, 0, 100, 0),
+(1289910,3,2063.83,-5917.86,106.994, 0, 1, 0, 100, 0),
+(1289910,4,2018.57,-5925.72,104.636, 0, 1, 0, 100, 0),
+(1289910,5,1978.91,-5931.81,103.270, 0, 1, 0, 100, 0),
+(1289910,6,1930.42,-5925.82,103.547, 0, 1, 0, 100, 0),
+(1289910,7,1882.12,-5918.43,104.002, 0, 1, 0, 100, 0),
+(1289910,8,1847.43,-5919.06,106.024, 0, 1, 0, 100, 0),
+(1289910,9,1803.47,-5923.31,115.736, 0, 1, 0, 100, 0),
+(1289910,10,1746.99,-5912.37,116.11, 0, 1, 0, 100, 0),
+(1289910,11,1706.68,-5886.96,116.13, 0, 1, 0, 100, 0),
+(1289910,12,1658.84,-5845.24,116.13, 0, 1, 0, 100, 0),
+(1289910,13,1644.38,-5842.67,117.29, 2000, 1, 1188, 100, 0);
+-- #12
+UPDATE creature SET position_x = 2170.457764, position_y = -5907.129883, position_z = 100.424911, orientation = 3.02, spawndist = 0, MovementType = 2 WHERE guid = 128935;
+DELETE FROM `creature_addon` WHERE `guid` IN (128935);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128935, 1289350, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289350;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289350,1,2170.45,-5907.12,100.424, 4000, 1, 0, 100, 0),
+(1289350,2,2142.37,-5894.82,101.973, 0, 1, 0, 100, 0),
+(1289350,3,2107.72,-5872.92,103.053, 0, 1, 0, 100, 0),
+(1289350,4,2067.51,-5867.54,103.870, 0, 1, 0, 100, 0),
+(1289350,5,2024.79,-5869.48,101.221, 0, 1, 0, 100, 0),
+(1289350,6,1951.56,-5846.48,100.403, 0, 1, 0, 100, 0),
+(1289350,7,1869.61,-5831.08,100.987, 0, 1, 0, 100, 0),
+(1289350,8,1830.11,-5820.79,101.520, 0, 1, 0, 100, 0),
+(1289350,9,1768.9,-5799.65,116.1450, 0, 1, 0, 100, 0),
+(1289350,10,1756.63,-5788.3,116.123, 0, 1, 0, 100, 0),
+(1289350,11,1744.66,-5783.13,116.12, 0, 1, 0, 100, 0),
+(1289350,12,1742.19,-5775.26,116.120, 0, 1, 0, 100, 0),
+(1289350,13,1748.05,-5772.54,117.08, 2000, 1, 1188, 100, 0);
+-- #13
+UPDATE creature SET position_x = 2217.407471, position_y = -5875.900391, position_z = 101.085777, orientation = 2.83, spawndist = 0, MovementType = 2 WHERE guid = 128985;
+DELETE FROM `creature_addon` WHERE `guid` IN (128985);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128985, 1289850, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289850;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289850,1,2217.40,-5875.90,101.085, 6000, 1, 0, 100, 0),
+(1289850,2,2196.64,-5866.59,101.304, 0, 1, 0, 100, 0),
+(1289850,3,2170.04,-5867.43,101.340, 0, 1, 0, 100, 0),
+(1289850,4,2137.81,-5856.76,101.391, 0, 1, 0, 100, 0),
+(1289850,5,2082.67,-5847.29,103.244, 0, 1, 0, 100, 0),
+(1289850,6,2029.99,-5848.05,100.431, 0, 1, 0, 100, 0),
+(1289850,7,1969.77,-5874.91,100.636, 0, 1, 0, 100, 0),
+(1289850,8,1918.99,-5906.72,101.467, 0, 1, 0, 100, 0),
+(1289850,9,1858.61,-5915.66,104.490, 0, 1, 0, 100, 0),
+(1289850,10,1803.63,-5926.08,115.62, 0, 1, 0, 100, 0),
+(1289850,11,1768.5,-5923.63,116.119, 0, 1, 0, 100, 0),
+(1289850,12,1754.77,-5942.33,116.14, 0, 1, 0, 100, 0),
+(1289850,13,1742.09,-5966.46,117.12, 2000, 1, 1188, 100, 0);
+-- #14
+UPDATE creature SET position_x = 1941.105225, position_y = -5799.148926, position_z = 100.515633, orientation = 5.55, spawndist = 0, MovementType = 2 WHERE guid = 128936;
+DELETE FROM `creature_addon` WHERE `guid` IN (128936);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128936, 1289360, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289360;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289360,1,1941.10,-5799.14,100.515, 0, 1, 0, 100, 0),
+(1289360,2,1945.67,-5802.12,100.476, 0, 1, 0, 100, 0),
+(1289360,3,1951.73,-5799.14,100.577, 0, 1, 0, 100, 0),
+(1289360,4,1942.04,-5772.9,102.1260, 0, 1, 0, 100, 0),
+(1289360,5,1927.43,-5772.54,101.941, 0, 1, 0, 100, 0),
+(1289360,6,1895.65,-5808.82,101.188, 0, 1, 0, 100, 0),
+(1289360,7,1866.02,-5820.96,100.295, 0, 1, 0, 100, 0),
+(1289360,8,1826.25,-5818.95,102.312, 0, 1, 0, 100, 0),
+(1289360,9,1772.64,-5818.85,115.730, 0, 1, 0, 100, 0),
+(1289360,10,1717.71,-5814.72,116.15, 0, 1, 0, 100, 0),
+(1289360,11,1664.44,-5790.83,116.12, 0, 1, 0, 100, 0),
+(1289360,12,1608.48,-5763.8,116.663, 0, 1, 0, 100, 0),
+(1289360,13,1595.3,-5741.35,119.236, 0, 1, 0, 100, 0),
+(1289360,14,1585.9,-5721.38,121.680, 0, 1, 0, 100, 0),
+(1289360,15,1575.5,-5724.96,120.779, 2000, 1, 1188, 100, 0);
+-- #15
+UPDATE creature SET position_x = 1941.454590, position_y = -5800.637695, position_z = 100.260811, orientation = 5.36, spawndist = 0, MovementType = 2 WHERE guid = 128927;
+DELETE FROM `creature_addon` WHERE `guid` IN (128927);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128927, 1289270, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289270;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289270,1,1941.45,-5800.63,100.260, 5000, 1, 0, 100, 0),
+(1289270,2,1886.91,-5834.98,101.234, 0, 1, 0, 100, 0),
+(1289270,3,1852.12,-5830.11,100.757, 0, 1, 0, 100, 0),
+(1289270,4,1831.31,-5827.4,101.2170, 0, 1, 0, 100, 0),
+(1289270,5,1779.23,-5826.67,115.221, 0, 1, 0, 100, 0),
+(1289270,6,1733.84,-5854.41,116.616, 0, 1, 0, 100, 0),
+(1289270,7,1683.82,-5870.42,116.177, 0, 1, 0, 100, 0),
+(1289270,8,1659.01,-5878.35,117.142, 2000, 1, 1188, 100, 0);
+-- #16
+UPDATE creature SET position_x = 1939.179810, position_y = -5802.433105, position_z = 100.259399, orientation = 4.3, spawndist = 0, MovementType = 2 WHERE guid = 128924;
+DELETE FROM `creature_addon` WHERE `guid` IN (128924);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128924, 1289240, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289240;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289240,1,1939.17,-5802.43,100.259, 3000, 1, 0, 100, 0),
+(1289240,2,1905.17,-5812.59,100.617, 0, 1, 0, 100, 0),
+(1289240,3,1839.49,-5820.87,100.435, 0, 1, 0, 100, 0),
+(1289240,4,1770.56,-5825.94,115.982, 0, 1, 0, 100, 0),
+(1289240,5,1750.1,-5823.17,116.1220, 0, 1, 0, 100, 0),
+(1289240,6,1747.84,-5801.86,117.123, 2000, 1, 1188, 100, 0);
+-- #17
+UPDATE creature SET position_x = 1938.616211, position_y = -5867.627930, position_z = 99.059547, orientation = 0.5, spawndist = 0, MovementType = 2 WHERE guid = 128986;
+DELETE FROM `creature_addon` WHERE `guid` IN (128986);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128986, 1289860, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289860;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289860,1,1938.61,-5867.62,99.0595, 0, 1, 0, 100, 0),
+(1289860,2,1953.07,-5871.43,100.064, 0, 1, 0, 100, 0),
+(1289860,3,1957.82,-5886.43,101.620, 0, 1, 0, 100, 0),
+(1289860,4,1927.15,-5905.47,101.052, 0, 1, 0, 100, 0),
+(1289860,5,1865.38,-5906.94,103.945, 0, 1, 0, 100, 0),
+(1289860,6,1813.74,-5924.07,114.088, 0, 1, 0, 100, 0),
+(1289860,7,1744.47,-5905.5,116.1420, 0, 1, 0, 100, 0),
+(1289860,8,1666.27,-5874.95,116.156, 0, 1, 0, 100, 0),
+(1289860,9,1659.64,-5878.93,117.141, 2000, 1, 1188, 100, 0);
+-- #18
+UPDATE creature SET position_x = 2067.154541, position_y = -5900.735840, position_z = 105.315590, orientation = 3.37, spawndist = 0, MovementType = 2 WHERE guid = 128925;
+DELETE FROM `creature_addon` WHERE `guid` IN (128925);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128925, 1289250, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289250;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289250,1,2067.15,-5900.73,105.315, 10000, 1, 0, 100, 0),
+(1289250,2,2023.75,-5909.85,104.968, 0, 1, 0, 100, 0),
+(1289250,3,1950.40,-5910.79,101.778, 0, 1, 0, 100, 0),
+(1289250,4,1898.09,-5912.00,101.896, 0, 1, 0, 100, 0),
+(1289250,5,1854.49,-5919.36,104.994, 0, 1, 0, 100, 0),
+(1289250,6,1805.89,-5925.83,115.401, 0, 1, 0, 100, 0),
+(1289250,7,1739.83,-5908.36,116.121, 0, 1, 0, 100, 0),
+(1289250,8,1695.83,-5881.50,116.135, 0, 1, 0, 100, 0),
+(1289250,9,1652.39,-5843.25,116.135, 0, 1, 0, 100, 0),
+(1289250,10,1645.1,-5842.39,117.290, 2000, 1, 1188, 100, 0);
+-- #19
+UPDATE creature SET spawndist = 0, MovementType = 2 WHERE guid = 128919;
+DELETE FROM `creature_addon` WHERE `guid` IN (128919);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128919, 1289190, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289190;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289190,1,2159.18,-5892.81,101.401, 0, 1, 0, 100, 0),
+(1289190,2,2132.78,-5865.54,101.596, 0, 1, 0, 100, 0),
+(1289190,3,2084.84,-5829.55,102.578, 0, 1, 0, 100, 0),
+(1289190,4,2054.93,-5803.12,102.494, 0, 1, 0, 100, 0),
+(1289190,5,1997.51,-5805.87,100.678, 0, 1, 0, 100, 0),
+(1289190,6,1977.29,-5813.95,101.035, 0, 1, 0, 100, 0),
+(1289190,7,1959.61,-5811.83,101.148, 0, 1, 0, 100, 0),
+(1289190,8,1941.14,-5799.42,100.516, 2000, 1, 1188, 100, 0);
+-- #20
+UPDATE creature SET position_x = 2067.149414, position_y = -5885.223633, position_z = 104.120804, orientation = 3.6, spawndist = 0, MovementType = 2 WHERE guid = 128974;
+DELETE FROM `creature_addon` WHERE `guid` IN (128974);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128974, 1289740, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289740;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289740,1,2067.14,-5885.22,104.120, 6000, 1, 0, 100, 0),
+(1289740,2,2034.37,-5906.14,105.076, 0, 1, 0, 100, 0),
+(1289740,3,1948.81,-5904.8,101.3640, 0, 1, 0, 100, 0),
+(1289740,4,1899,   -5901.04,102.011, 0, 1, 0, 100, 0),
+(1289740,5,1857.14,-5919.97,104.759, 0, 1, 0, 100, 0),
+(1289740,6,1806.77,-5925.39,115.368, 0, 1, 0, 100, 0),
+(1289740,7,1743.95,-5906.21,116.130, 0, 1, 0, 100, 0),
+(1289740,8,1696.17,-5874.24,116.141, 0, 1, 0, 100, 0),
+(1289740,9,1666.11,-5875.97,116.156, 0, 1, 0, 100, 0),
+(1289740,10,1660.01,-5877.95,117.14, 2000, 1, 1188, 100, 0);
+-- #21
+UPDATE creature SET position_x = 2140.980225, position_y = -5779.114258, position_z = 99.407547, orientation = 3.5, spawndist = 0, MovementType = 2 WHERE guid = 128939;
+DELETE FROM `creature_addon` WHERE `guid` IN (128939);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128939, 1289390, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289390;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289390,1,2140.98,-5779.11,99.4075, 6000, 1, 0, 100, 0),
+(1289390,2,2086.14,-5775.21,99.1742, 0, 1, 0, 100, 0),
+(1289390,3,2043.6,-5761.94,98.89110, 0, 1, 0, 100, 0),
+(1289390,4,2008.65,-5779.73,100.501, 0, 1, 0, 100, 0),
+(1289390,5,1977.81,-5796.46,100.932, 0, 1, 0, 100, 0),
+(1289390,6,1942.26,-5800.28,100.278, 2000, 1, 1188, 100, 0);
+-- #22
+UPDATE creature SET position_x = 2116.1, position_y = -5802.52, position_z = 100.8, orientation = 0.9, spawndist = 0, MovementType = 2 WHERE guid = 128923;
+DELETE FROM `creature_addon` WHERE `guid` IN (128923);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128923, 1289230, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289230;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289230,1,2116.10,-5802.52,100.800, 0, 1, 0, 100, 0),
+(1289230,2,2119.35,-5797.03,99.6076, 0, 1, 0, 100, 0),
+(1289230,3,2117.58,-5787.27,98.7951, 0, 1, 0, 100, 0),
+(1289230,4,2076.21,-5768.19,99.1701, 0, 1, 0, 100, 0),
+(1289230,5,2034.56,-5763.16,99.7534, 0, 1, 0, 100, 0),
+(1289230,6,2000.9,-5792.28,100.6950, 0, 1, 0, 100, 0),
+(1289230,7,1956.93,-5830.99,100.828, 0, 1, 0, 100, 0),
+(1289230,8,1906.43,-5844.33,100.691, 0, 1, 0, 100, 0),
+(1289230,9,1870.69,-5831.22,101.043, 0, 1, 0, 100, 0),
+(1289230,10,1837.45,-5821.06,100.59, 0, 1, 0, 100, 0),
+(1289230,11,1774.77,-5819.43,115.49, 0, 1, 0, 100, 0),
+(1289230,12,1752.66,-5819.17,116.12, 0, 1, 0, 100, 0),
+(1289230,13,1747.47,-5809.54,116.12, 0, 1, 0, 100, 0),
+(1289230,14,1748.39,-5803.1,117.124, 2000, 1, 1188, 100, 0);
+-- #23
+UPDATE creature SET position_x = 1908.830811, position_y = -5884.311035, position_z = 100.260605, orientation = 4.1, spawndist = 0, MovementType = 2 WHERE guid = 128910;
+DELETE FROM `creature_addon` WHERE `guid` IN (128910);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES  
+(128910, 1289100, 0, 0, '');
+DELETE FROM `waypoint_data` WHERE `id`=1289100;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1289100,1,1908.8,-5884.31,100.260, 0, 1, 0, 100, 0),
+(1289100,2,1870.1,-5910.93,104.046, 0, 1, 0, 100, 0),
+(1289100,3,1823.62,-5927.41,112.22, 0, 1, 0, 100, 0),
+(1289100,4,1793.2,-5931.67,116.089, 0, 1, 0, 100, 0),
+(1289100,5,1751.19,-5914.43,116.11, 0, 1, 0, 100, 0),
+(1289100,6,1696.15,-5881.5,116.137, 0, 1, 0, 100, 0),
+(1289100,7,1652.94,-5833.58,116.20, 0, 1, 0, 100, 0),
+(1289100,8,1615.36,-5781.67,116.11, 0, 1, 0, 100, 0),
+(1289100,9,1586.79,-5723.86,121.68, 2000, 1, 1188, 100, 0);
diff --git a/sql/updates/world/4.3.4/2018_04_06_01_world_from_335_was_2018_03_29_01_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_01_world_from_335_was_2018_03_29_01_world_335.sql
new file mode 100644
index 00000000000..b8b95c42eee
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_01_world_from_335_was_2018_03_29_01_world_335.sql
@@ -0,0 +1,8 @@
+/*
+--
+UPDATE `quest_template_locale` SET `Objectives` = 'Findet den \"Sammler\" und tötet ihn, dann kehrt mit dem Ring des Sammlers zu Marschall Dughan zurück.', `CompletedText` = 'Kehrt zu Marschall Dughan im Holzfällerlager des Osttals im Wald von Elwynn zurück.' WHERE `ID` = 147 AND `locale` = 'deDE';
+UPDATE `quest_template_locale` SET `Objectives` = 'Encuentra y mata al Coleccionista y vuelve junto al alguacil Dughan con la sortija del coleccionista.',  `CompletedText` = 'Vuelve con: Alguacil Dughan. Zona: Aserradero de la Vega del Este, Bosque de Elwynn.' WHERE `ID` = 147 AND `locale` = 'esES';
+UPDATE `quest_template_locale` SET `Objectives` = 'Encuentra y mata al Coleccionista y vuelve junto al alguacil Dughan con la sortija del coleccionista.', `CompletedText` = 'Vuelve con: Alguacil Dughan. Zona: Aserradero de la Vega del Este, Bosque de Elwynn.' WHERE `ID` = 147 AND `locale` = 'esMX';
+UPDATE `quest_template_locale` SET `Objectives` = 'Trouvez et tuez le « Collecteur » puis rapportez l’Anneau du Collecteur au Maréchal Dughan.', `CompletedText` = 'Retournez voir le Maréchal Dughan au Camp de bûcherons du Val d\'Est, dans la Forêt d\'Elwynn.' WHERE `ID` = 147 AND `locale` = 'frFR';
+UPDATE `quest_template_locale` SET `Objectives` = 'Найдите и убейте \"Вымогателя\", а затем принесите его кольцо маршалу Дугхан.', `CompletedText` = 'Вернитесь к маршалу Дугхан на лесопилку Восточной долины в Элвиннском лесу.' WHERE `ID` = 147 AND `locale` = 'ruRU';
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_02_world_from_335_was_2018_04_04_00_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_02_world_from_335_was_2018_04_04_00_world_335.sql
new file mode 100644
index 00000000000..377942cbe86
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_02_world_from_335_was_2018_04_04_00_world_335.sql
@@ -0,0 +1,183 @@
+/*
+-- Add pool for Deathspeaker Selendre
+SET @GUID := 64986;
+SET @POOL := 386;
+DELETE FROM `creature` WHERE `guid`=@GUID;
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+(@GUID,10827,0,0,0,1,1,0,0,2519.05,-3694.31,180.13,5.47616,72000,0,0,2550,5206,2,0,0,0,"",0);
+
+DELETE FROM `pool_template` WHERE `entry`=@POOL;
+INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
+(@POOL,1,"Deathspeaker Selendre");
+
+DELETE FROM `pool_creature` WHERE `pool_entry`=@POOL;
+INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES
+(@GUID,@POOL,0,"Deathspeaker Selendre (10827) - Spawn 1"),
+(86755,@POOL,0,"Deathspeaker Selendre (10827) - Spawn 2");
+
+-- Add pathing for Deathspeaker Selendre (Spawn 1)
+DELETE FROM `creature_addon` WHERE `guid`=@GUID;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(@GUID,@GUID*10,0,0,1,0,"");
+
+DELETE FROM `waypoint_data` WHERE `id`=@GUID*10;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@GUID*10,1,2519.05,-3694.31,180.13,0,0,0,0,100,0),
+(@GUID*10,2,2528.03,-3700.27,179.738,0,0,0,0,100,0),
+(@GUID*10,3,2534.58,-3716.14,179.306,0,0,0,0,100,0),
+(@GUID*10,4,2538.02,-3734.97,178.969,0,0,0,0,100,0),
+(@GUID*10,5,2536.86,-3749.52,178.694,0,0,0,0,100,0),
+(@GUID*10,6,2531.39,-3761.01,179.057,0,0,0,0,100,0),
+(@GUID*10,7,2518.99,-3777.55,177.511,0,0,0,0,100,0),
+(@GUID*10,8,2525.06,-3781.92,177.836,0,0,0,0,100,0),
+(@GUID*10,9,2530.46,-3785.8,181.689,0,0,0,0,100,0),
+(@GUID*10,10,2537.83,-3791.9,185.059,0,0,0,0,100,0),
+(@GUID*10,11,2556.67,-3806.27,185.059,0,0,0,0,100,0),
+(@GUID*10,12,2552.53,-3811.77,185.059,0,0,0,0,100,0),
+(@GUID*10,13,2554.51,-3818.25,182.059,0,0,0,0,100,0),
+(@GUID*10,14,2561.12,-3822.2,182.059,0,0,0,0,100,0),
+(@GUID*10,15,2568.87,-3821.11,182.059,0,0,0,0,100,0),
+(@GUID*10,16,2575.12,-3811.81,182.059,0,0,0,0,100,0),
+(@GUID*10,17,2572.09,-3803.6,182.059,0,0,0,0,100,0),
+(@GUID*10,18,2565.51,-3800.57,182.244,0,0,0,0,100,0),
+(@GUID*10,19,2560.86,-3801,185.058,0,0,0,0,100,0),
+(@GUID*10,20,2557.16,-3806.54,185.058,0,0,0,0,100,0),
+(@GUID*10,21,2537.49,-3792.32,185.058,0,0,0,0,100,0),
+(@GUID*10,22,2529.21,-3786.65,181.345,0,0,0,0,100,0),
+(@GUID*10,23,2522.47,-3782.02,177.509,0,0,0,0,100,0),
+(@GUID*10,24,2511.13,-3782.1,177.506,0,0,0,0,100,0),
+(@GUID*10,25,2505.32,-3766.45,177.742,0,0,0,0,100,0),
+(@GUID*10,26,2499.29,-3765.75,177.507,0,0,0,0,100,0),
+(@GUID*10,27,2493.61,-3765.09,177.507,0,0,0,0,100,0),
+(@GUID*10,28,2488.06,-3772.43,177.667,0,0,0,0,100,0),
+(@GUID*10,29,2478.6,-3767.26,180.055,0,0,0,0,100,0),
+(@GUID*10,30,2463.88,-3762.3,177.666,0,0,0,0,100,0),
+(@GUID*10,31,2446.59,-3773.59,178.28,0,0,0,0,100,0),
+(@GUID*10,32,2439.01,-3778.42,182.265,0,0,0,0,100,0),
+(@GUID*10,33,2432.32,-3782.88,185.472,0,0,0,0,100,0),
+(@GUID*10,34,2411.83,-3797.16,185.472,0,0,0,0,100,0),
+(@GUID*10,35,2415.58,-3802.36,185.472,0,0,0,0,100,0),
+(@GUID*10,36,2414.56,-3808.81,182.472,0,0,0,0,100,0),
+(@GUID*10,37,2406.03,-3813.16,182.472,0,0,0,0,100,0),
+(@GUID*10,38,2398.47,-3811.12,182.472,0,0,0,0,100,0),
+(@GUID*10,39,2394.15,-3802.58,182.472,0,0,0,0,100,0),
+(@GUID*10,40,2395.78,-3795.05,182.472,0,0,0,0,100,0),
+(@GUID*10,41,2402.87,-3790.52,182.557,0,0,0,0,100,0),
+(@GUID*10,42,2407.82,-3791.89,185.472,0,0,0,0,100,0),
+(@GUID*10,43,2412.66,-3796.79,185.472,0,0,0,0,100,0),
+(@GUID*10,44,2431.26,-3783.83,185.472,0,0,0,0,100,0),
+(@GUID*10,45,2439.74,-3777.69,181.587,0,0,0,0,100,0),
+(@GUID*10,46,2445.84,-3773.07,178.365,0,0,0,0,100,0),
+(@GUID*10,47,2455.68,-3785.4,178.221,0,0,0,0,100,0),
+(@GUID*10,48,2457.6,-3806.44,178.436,0,0,0,0,100,0),
+(@GUID*10,49,2453.84,-3819.84,178.737,0,0,0,0,100,0),
+(@GUID*10,50,2463.63,-3826.59,180.355,0,0,0,0,100,0),
+(@GUID*10,51,2476.42,-3822.85,181.172,0,0,0,0,100,0),
+(@GUID*10,52,2485.1,-3812.75,179.831,0,0,0,0,100,0),
+(@GUID*10,53,2480.62,-3800.22,178.74,0,0,0,0,100,0),
+(@GUID*10,54,2459.22,-3787.09,178.419,0,0,0,0,100,0),
+(@GUID*10,55,2444.28,-3759.46,177.54,0,0,0,0,100,0),
+(@GUID*10,56,2418.65,-3747.28,178.11,0,0,0,0,100,0),
+(@GUID*10,57,2402.3,-3746.86,179.548,0,0,0,0,100,0),
+(@GUID*10,58,2389.34,-3753.05,180.059,0,0,0,0,100,0),
+(@GUID*10,59,2393.41,-3730.55,179.646,0,0,0,0,100,0),
+(@GUID*10,60,2391.13,-3712.96,180.489,0,0,0,0,100,0),
+(@GUID*10,61,2382.1,-3695.87,178.616,0,0,0,0,100,0),
+(@GUID*10,62,2383.45,-3676.65,178.75,0,0,0,0,100,0),
+(@GUID*10,63,2398.82,-3677.72,180.299,0,0,0,0,100,0),
+(@GUID*10,64,2416.71,-3671.23,177.938,0,0,0,0,100,0),
+(@GUID*10,65,2432.07,-3674.78,178.847,0,0,0,0,100,0),
+(@GUID*10,66,2444.61,-3659.84,178.354,0,0,0,0,100,0),
+(@GUID*10,67,2449.41,-3654.12,178.171,0,0,0,0,100,0),
+(@GUID*10,68,2444.29,-3641.95,179.354,0,0,0,0,100,0),
+(@GUID*10,69,2429.71,-3633.13,179.324,0,0,0,0,100,0),
+(@GUID*10,70,2432.72,-3624.53,179.08,0,0,0,0,100,0),
+(@GUID*10,71,2445.42,-3621.45,179.625,0,0,0,0,100,0),
+(@GUID*10,72,2450.93,-3630.38,178.698,0,0,0,0,100,0),
+(@GUID*10,73,2452.16,-3632.38,178.682,0,0,0,0,100,0),
+(@GUID*10,74,2463.72,-3640.3,178.907,0,0,0,0,100,0),
+(@GUID*10,75,2459.88,-3661.08,177.627,0,0,0,0,100,0),
+(@GUID*10,76,2473.04,-3676.41,178.342,0,0,0,0,100,0),
+(@GUID*10,77,2479.66,-3692.7,179.121,0,0,0,0,100,0),
+(@GUID*10,78,2485.39,-3706.78,180.135,0,0,0,0,100,0),
+(@GUID*10,79,2483.55,-3717.48,181.223,0,0,0,0,100,0),
+(@GUID*10,80,2472.62,-3722.2,181.107,0,0,0,0,100,0),
+(@GUID*10,81,2460.63,-3708.49,178.649,0,0,0,0,100,0),
+(@GUID*10,82,2462.01,-3697.02,178.186,0,0,0,0,100,0),
+(@GUID*10,83,2473.57,-3694.13,179.281,0,0,0,0,100,0),
+(@GUID*10,84,2491.08,-3694.42,179.212,0,0,0,0,100,0);
+
+-- Add pathing for Deathspeaker Selendre (Spawn 2)
+UPDATE `creature` SET `MovementType`=2 WHERE `guid`=86755;
+DELETE FROM `creature_addon` WHERE `guid`=86755;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(86755,867550,0,0,1,0,"");
+
+DELETE FROM `waypoint_data` WHERE `id`=867550;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(867550,1,2633.53,-5512.31,158.266,0,0,0,0,100,0),
+(867550,2,2641.01,-5540.31,159.216,0,0,0,0,100,0),
+(867550,3,2653.46,-5552.56,159.34,0,0,0,0,100,0),
+(867550,4,2668.72,-5552.25,160.452,0,0,0,0,100,0),
+(867550,5,2679.62,-5537.82,160.818,0,0,0,0,100,0),
+(867550,6,2683.71,-5518.79,159.878,0,0,0,0,100,0),
+(867550,7,2695.21,-5511.24,158.123,0,0,0,0,100,0),
+(867550,8,2704.09,-5499.15,157.063,0,0,0,0,100,0),
+(867550,9,2708.13,-5475.21,156.953,0,0,0,0,100,0),
+(867550,10,2731.05,-5464.05,157.015,0,0,0,0,100,0),
+(867550,11,2731.99,-5480.38,161.471,0,0,0,0,100,0),
+(867550,12,2732.98,-5491.9,162.069,0,0,0,0,100,0),
+(867550,13,2741.12,-5501.31,166.418,0,0,0,0,100,0),
+(867550,14,2748.96,-5510.25,166.428,0,0,0,0,100,0),
+(867550,15,2754.52,-5508.12,165.928,0,0,0,0,100,0),
+(867550,16,2757.52,-5509.1,164.573,0,0,0,0,100,0),
+(867550,17,2758.95,-5511.08,163.551,0,0,0,0,100,0),
+(867550,18,2758.95,-5513.17,163.038,0,0,0,0,100,0),
+(867550,19,2755.42,-5517.98,161.743,0,0,0,0,100,0),
+(867550,20,2762.02,-5525.39,161.737,0,0,0,0,100,0),
+(867550,21,2769.75,-5524.21,161.737,0,0,0,0,100,0),
+(867550,22,2776.09,-5530.58,161.737,0,0,0,0,100,0),
+(867550,23,2766.78,-5538.91,161.737,0,0,0,0,100,0),
+(867550,24,2762.42,-5537.22,161.737,0,0,0,0,100,0),
+(867550,25,2759.18,-5531.55,161.737,0,0,0,0,100,0),
+(867550,26,2761.79,-5526.45,161.737,0,0,0,0,100,0),
+(867550,27,2759.07,-5522.23,161.737,0,0,0,0,100,0),
+(867550,28,2755.78,-5518.92,161.74,0,0,0,0,100,0),
+(867550,29,2749.79,-5521.54,163.08,0,0,0,0,100,0),
+(867550,30,2745.88,-5520.01,164.442,0,0,0,0,100,0),
+(867550,31,2745.74,-5516.86,165.591,0,0,0,0,100,0),
+(867550,32,2746.29,-5515.2,166.298,0,0,0,0,100,0),
+(867550,33,2748.89,-5512.05,166.43,0,0,0,0,100,0),
+(867550,34,2740.96,-5502.26,166.418,0,0,0,0,100,0),
+(867550,35,2734.43,-5494.47,162.071,0,0,0,0,100,0),
+(867550,36,2724.37,-5483.28,161.458,0,0,0,0,100,0),
+(867550,37,2702.21,-5460.21,157.012,0,0,0,0,100,0),
+(867550,38,2688.36,-5456.17,157.155,0,0,0,0,100,0),
+(867550,39,2669.61,-5456.86,156.929,0,0,0,0,100,0),
+(867550,40,2660.04,-5444.49,156.926,0,0,0,0,100,0),
+(867550,41,2650.58,-5424.81,157.095,0,0,0,0,100,0),
+(867550,42,2656.66,-5407.65,158.167,0,0,0,0,100,0),
+(867550,43,2672.4,-5398.03,157.001,0,0,0,0,100,0),
+(867550,44,2695.58,-5373.55,157.803,0,0,0,0,100,0),
+(867550,45,2725.65,-5375.05,157.781,0,0,0,0,100,0),
+(867550,46,2751.57,-5375.31,156.949,0,0,0,0,100,0),
+(867550,47,2771.12,-5384.22,157.482,0,0,0,0,100,0),
+(867550,48,2784.59,-5399.42,160.854,0,0,0,0,100,0),
+(867550,49,2797.84,-5398.13,162.834,0,0,0,0,100,0),
+(867550,50,2808.66,-5407.03,162.822,0,0,0,0,100,0),
+(867550,51,2814.93,-5418.1,160.679,0,0,0,0,100,0),
+(867550,52,2808.52,-5434.4,158.947,0,0,0,0,100,0),
+(867550,53,2796.89,-5447.17,160.524,0,0,0,0,100,0),
+(867550,54,2783.1,-5450.75,161.02,0,0,0,0,100,0),
+(867550,55,2752.6,-5458.67,157,0,0,0,0,100,0),
+(867550,56,2738.31,-5456.31,156.946,0,0,0,0,100,0),
+(867550,57,2725.15,-5462.05,156.962,0,0,0,0,100,0),
+(867550,58,2711.18,-5475.83,157.095,0,0,0,0,100,0),
+(867550,59,2685.64,-5474.16,156.989,0,0,0,0,100,0),
+(867550,60,2669.68,-5451.54,157.027,0,0,0,0,100,0),
+(867550,61,2645.86,-5449.2,156.941,0,0,0,0,100,0),
+(867550,62,2632.98,-5462.23,157.103,0,0,0,0,100,0),
+(867550,63,2626.28,-5483.26,157.083,0,0,0,0,100,0),
+(867550,64,2616.9,-5493.82,157.194,0,0,0,0,100,0),
+(867550,65,2616.39,-5504.67,158.186,0,0,0,0,100,0);
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_03_world_from_335_was_2018_04_04_01_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_03_world_from_335_was_2018_04_04_01_world_335.sql
new file mode 100644
index 00000000000..eee5f48de56
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_03_world_from_335_was_2018_04_04_01_world_335.sql
@@ -0,0 +1,38 @@
+/*
+-- Pathing for Scarlet Smith
+UPDATE `creature` SET `position_x`=2990.86, `position_y`=-1458.58, `position_z`=146.273, `spawndist`=0, `MovementType`=2 WHERE `guid`=61634;
+
+DELETE FROM `creature_addon` WHERE `guid`=61634;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(61634,616340,0,0,1,0,"");
+
+DELETE FROM `waypoint_data` WHERE `id`=616340;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(616340,1,2990.86,-1458.58,146.273,0,0,0,0,100,0),
+(616340,2,2978.03,-1450.18,145.989,0,0,0,0,100,0),
+(616340,3,2962.46,-1452.65,145.716,0,0,0,0,100,0),
+(616340,4,2963.32,-1464.52,145.592,0,0,0,0,100,0),
+(616340,5,2973.34,-1468.99,145.754,0,0,0,0,100,0),
+(616340,6,2974.3,-1475.57,145.509,0,0,0,0,100,0),
+(616340,7,2974.67,-1484.54,146.999,0,0,0,0,100,0),
+(616340,8,2975.15,-1490.23,147.022,0,0,0,0,100,0),
+(616340,9,2984.02,-1491.19,147.042,6.18384,20000,0,616340,100,0),
+(616340,10,2974.94,-1498.83,147.042,3.80251,20000,0,616340,100,0),
+(616340,11,2978.95,-1500.69,146.999,0,0,0,0,100,0),
+(616340,12,2979.92,-1509.63,145.319,0,0,0,0,100,0),
+(616340,13,2996.73,-1508.11,146.204,0,0,0,0,100,0),
+(616340,14,3004.9,-1514.71,145.967,0,0,0,0,100,0),
+(616340,15,3005.29,-1522.01,146.069,0,0,0,0,100,0),
+(616340,16,2992.68,-1516.82,146.041,0,0,0,0,100,0),
+(616340,17,2996.49,-1507.15,146.152,0,0,0,0,100,0),
+(616340,18,3004.37,-1496.56,146.397,0,0,0,0,100,0),
+(616340,19,3005.32,-1481.19,145.908,0,0,0,0,100,0),
+(616340,20,3008.27,-1470.62,146.531,0,0,0,0,100,0),
+(616340,21,3002.19,-1461.06,146.273,0,0,0,0,100,0),
+(616340,22,2998.02,-1460.04,145.81,0,0,0,0,100,0);
+
+DELETE FROM `waypoint_scripts` WHERE `id`=616340;
+INSERT INTO `waypoint_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`, `guid`) VALUES
+(616340,1,1,69,1,0,0,0,0,0,5),
+(616340,18,1,0,1,0,0,0,0,0,6);
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_04_world_from_335_was_2018_04_04_02_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_04_world_from_335_was_2018_04_04_02_world_335.sql
new file mode 100644
index 00000000000..faa73cedcab
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_04_world_from_335_was_2018_04_04_02_world_335.sql
@@ -0,0 +1,23 @@
+/*
+-- Common Kitten
+DELETE FROM `creature_text` WHERE `CreatureID` IN (9937,9936);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(9937,0,0,"%s jumps into the moonwell, and goes underwater...",16,0,100,0,0,0,5939,0,"Common Kitten"),
+(9936,1,0,"%s follows $n obediently.",16,0,100,0,0,0,5940,0,"Corrupted Kitten");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=9937 AND `source_type`=0 AND `id` IN (0,1,2);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=993700 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
+(9937,0,0,0,54,0,100,0,0,0,0,0,80,993700,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Just Summoned - Run Script"),
+(993700,9,0,0,0,0,100,0,0,0,0,0,103,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Set Rooted On"),
+(993700,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,23,0,0,0,0,0,0,0,"Common Kitten - On Script - Say Line 0"),
+(993700,9,2,0,0,0,100,0,4000,4000,0,0,36,9936,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Update Template To 'Corrupted Kitten'"),
+(993700,9,3,0,0,0,100,0,0,0,0,0,11,16510,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Cast 'Corrupted Saber Visual (DND)'"),
+(993700,9,4,0,0,0,100,0,0,0,0,0,3,10042,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Morph to Entry 'Corrupted Kitten'"),
+(993700,9,5,0,0,0,100,0,2000,2000,0,0,103,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Set Rooted Off"),
+(993700,9,6,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,23,0,0,0,0,0,0,0,"Common Kitten - On Script - Say Line 1");
+
+DELETE FROM `gossip_menu` WHERE `MenuID`=55002; -- Add Gossip Text
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(55002,3550,0);
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_05_world_from_335_was_2018_04_04_03_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_05_world_from_335_was_2018_04_04_03_world_335.sql
new file mode 100644
index 00000000000..a85ddb9b4b3
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_05_world_from_335_was_2018_04_04_03_world_335.sql
@@ -0,0 +1,273 @@
+/*
+-- Chillwind Ravager
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7449 AND `source_type`=0 AND `id`=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
+(7449,0,1,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chillwind Ravager - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=7449;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7449,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Chillwind Ravager");
+
+-- Crazed Owlbeast
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7452 AND `source_type`=0 AND `id`=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
+(7452,0,1,0,2,0,100,1,0,50,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Crazed Owlbeast - Between 0-50% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=7452;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7452,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Crazed Owlbeast");
+
+-- Frostsaber Huntress
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7433 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
+(7433,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Frostsaber Huntress - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=7433;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7433,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Frostsaber Huntress");
+
+-- Frostsaber Pride Watcher
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7434 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
+(7434,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Frostsaber Pride Watcher - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=7434;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7434,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Frostsaber Pride Watcher");
+
+-- Rak'shiri
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10200 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
+(10200,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rak'shiri - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=10200;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10200,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Rak'shiri");
+
+-- Shadowhide Brute
+DELETE FROM `smart_scripts` WHERE `entryorguid`=432 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
+(432,0,2,0,2,0,100,1,0,30,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Shadowhide Brute - Between 0-30% Health - Say Line 1 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=432 AND `GroupID`=1;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(432,1,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Shadowhide Brute");
+
+-- Bloodscalp Witch Doctor
+DELETE FROM `smart_scripts` WHERE `entryorguid`=660 AND `source_type`=0 AND `id`=4;
+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
+(660,0,4,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Witch Doctor - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=660;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(660,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Bloodscalp Witch Doctor");
+
+-- Bloodscalp Scavenger
+DELETE FROM `smart_scripts` WHERE `entryorguid`=702 AND `source_type`=0 AND `id`=4;
+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
+(702,0,4,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Scavenger - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=702;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(702,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Bloodscalp Scavenger");
+
+-- Gan'zulah
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1061 AND `source_type`=0 AND `id`=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
+(1061,0,1,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gan'zulah - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=1061;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(1061,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Gan'zulah");
+
+-- Scarlet Executioner
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1841 AND `source_type`=0 AND `id`=4;
+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
+(1841,0,4,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Executioner - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=1841;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(1841,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Scarlet Executioner");
+
+-- Raging Thunder Lizard
+DELETE FROM `smart_scripts` WHERE `entryorguid`=4726 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
+(4726,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Thunder Lizard - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=4726;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(4726,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Raging Thunder Lizard");
+
+-- Withered Protector
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7149 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
+(7149,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Withered Protector - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=7149;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7149,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Withered Protector");
+
+-- Retherokk the Berserker
+DELETE FROM `smart_scripts` WHERE `entryorguid`=8216 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
+(8216,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Retherokk the Berserker - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=8216;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(8216,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Retherokk the Berserker");
+
+-- Verek
+DELETE FROM `smart_scripts` WHERE `entryorguid`=9042 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
+(9042,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Verek - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=9042;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(9042,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Verek");
+
+-- Xavathras
+DELETE FROM `smart_scripts` WHERE `entryorguid`=9454 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
+(9454,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Xavathras - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=9454;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(9454,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Xavathras");
+
+-- Brumeran
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10807 AND `source_type`=0 AND `id`=3;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(10807,0,3,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brumeran - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=10807;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10807,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Brumeran");
+
+-- Desert Rager
+DELETE FROM `smart_scripts` WHERE `entryorguid`=11747 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
+(11747,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Desert Rager - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=11747;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(11747,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Desert Rager");
+
+-- Twilight Avenger
+DELETE FROM `smart_scripts` WHERE `entryorguid`=11880 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
+(11880,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Twilight Avenger - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=11880;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(11880,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Twilight Avenger");
+
+-- Enraged Reef Crawler
+DELETE FROM `smart_scripts` WHERE `entryorguid`=12347 AND `source_type`=0 AND `id`=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
+(12347,0,1,0,2,0,100,1,0,20,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Enraged Reef Crawler - Between 0-20% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=12347;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(12347,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Enraged Reef Crawler");
+
+-- Mongress
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14344 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
+(14344,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mongress - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=14344;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(14344,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Mongress");
+
+-- Twilight Marauder
+DELETE FROM `smart_scripts` WHERE `entryorguid`=15542 AND `source_type`=0 AND `id`=3;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(15542,0,3,0,2,0,100,1,0,20,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Twilight Marauder - Between 0-20% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=15542;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(15542,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Twilight Marauder");
+
+-- Xandivious
+DELETE FROM `smart_scripts` WHERE `entryorguid`=15623 AND `source_type`=0 AND `id`=6;
+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
+(15623,0,6,0,2,0,100,1,0,50,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Xandivious - Between 0-50% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=15623;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(15623,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Xandivious");
+
+-- Gangled Cannibal
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16309 AND `source_type`=0 AND `id`=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
+(16309,0,1,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gangled Cannibal - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=16309;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(16309,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Gangled Cannibal");
+
+-- Vengeful Apparition
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16328 AND `source_type`=0 AND `id`=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
+(16328,0,1,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Vengeful Apparition - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=16328;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(16328,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Vengeful Apparition");
+
+-- Bonechewer Mutant
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16876 AND `source_type`=0 AND `id`=4;
+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
+(16876,0,4,0,2,0,100,1,0,50,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bonechewer Mutant - Between 0-50% Health - Say Line 1 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=16876 AND `GroupID`=1;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(16876,1,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Bonechewer Mutant");
+
+-- Gordunni Head-Splitter
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22148 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
+(22148,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gordunni Head-Splitter - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=22148;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(22148,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Gordunni Head-Splitter");
+
+-- Jabbering Ghoul
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10801 AND `source_type`=0 AND `id`=3;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(10801,0,3,0,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jabbering Ghoul - On Aggro - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=10801;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10801,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Jabbering Ghoul");
+
+-- Farmer Dalson
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10836 AND `source_type`=0 AND `id`=4;
+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
+(10836,0,4,0,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Farmer Dalson - On Aggro - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=10836;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10836,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Farmer Dalson");
+
+-- Raging Moonkin
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10160 AND `source_type`=0 AND `id` IN (0,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
+(10160,0,0,0,4,0,100,0,0,0,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Moonkin - On Aggro - Cast 'Enrage'"),
+(10160,0,2,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Moonkin - On Aggro - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=10160;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10160,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Raging Moonkin");
+
+-- Raging Owlbeast
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7451 AND `source_type`=0 AND `id` IN (1,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
+(7451,0,1,0,2,0,100,1,0,30,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Owlbeast - Between 0-30% Health - Cast Enrage (No Repeat)"),
+(7451,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Owlbeast - Between 0-30% Health - Say Line 0 (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=7451;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7451,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Raging Owlbeast");
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_06_world_from_335_was_2018_04_04_04_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_06_world_from_335_was_2018_04_04_04_world_335.sql
new file mode 100644
index 00000000000..72ef8b09c9b
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_06_world_from_335_was_2018_04_04_04_world_335.sql
@@ -0,0 +1,18 @@
+/*
+-- Mehlar Dawnblade
+DELETE FROM `creature_text` WHERE `CreatureID`=17099;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17099,0,0,"Uther Lightbringer brought only darkness to Quel'Thalas.  Let us see if we can bring some darkness to his tomb!",12,0,100,1,0,0,14112,0,"Mehlar Dawnblade"),
+(17099,1,0,"At last I will have my revenge!",12,0,100,11,0,0,14115,0,"Mehlar Dawnblade");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=17099;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17099 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1709900 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
+(17099,0,0,0,20,0,100,0,9443,0,0,0,80,1709900,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Quest 'The So-Called Mark of the Lightbringer' Finished - Run Script"),
+(1709900,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Remove Npc Flag Questgiver+Gossip"),
+(1709900,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,"Mehlar Dawnblade - On Script - Say Line 0"),
+(1709900,9,2,0,0,0,100,0,3000,3000,0,0,11,16633,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Cast 'Create Item Visual (DND)'"),
+(1709900,9,3,0,0,0,100,0,7000,7000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Say Line 1"),
+(1709900,9,4,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Add Npc Flag Questgiver+Gossip");
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_07_world_from_335_was_2018_04_04_05_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_07_world_from_335_was_2018_04_04_05_world_335.sql
new file mode 100644
index 00000000000..5943456571c
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_07_world_from_335_was_2018_04_04_05_world_335.sql
@@ -0,0 +1,8 @@
+/*
+-- Champion Cyssa Dawnrose --> Fix gossip text
+DELETE FROM `gossip_menu` WHERE `MenuID`=8111 AND `TextID` IN (10040,10044);
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(8111,10044,0);
+
+UPDATE `conditions` SET `SourceEntry`=10044 WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8111 AND `SourceEntry`=10040;
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_08_world_from_335_was_2018_04_04_06_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_08_world_from_335_was_2018_04_04_06_world_335.sql
new file mode 100644
index 00000000000..9936d8203f3
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_08_world_from_335_was_2018_04_04_06_world_335.sql
@@ -0,0 +1,17 @@
+/*
+-- Ambassador Sunsorrow
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7178;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,7178,8740,0,0,16,0,512,0,0,0,0,0,"","Show gossip text if player is a Blood Elf"),
+(14,7178,8458,0,0,16,0,1279,0,0,0,0,0,"","Show gossip text if player is not a Blood Elf");
+
+DELETE FROM `gossip_menu` WHERE `MenuID` IN (7178,8312) AND `TextID`=10378;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(8312,10378,0);
+
+UPDATE `gossip_menu_option` SET `ActionMenuID`=8312 WHERE `MenuID`=7178;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16287 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`, `event_param5`, `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
+(16287,0,0,0,62,0,100,0,7178,0,0,0,0,85,37084,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ambassador Sunsorrow - On Gossip Option 0 Selected - Create Item 'Lament of the Highborne'");
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_09_world_from_335_was_2018_04_04_07_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_09_world_from_335_was_2018_04_04_07_world_335.sql
new file mode 100644
index 00000000000..36d08ea1654
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_09_world_from_335_was_2018_04_04_07_world_335.sql
@@ -0,0 +1,12 @@
+/*
+-- Joseph Redpath's Monument
+UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=176145;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=176145 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
+(176145,1,0,0,70,0,100,1,2,0,0,0,12,10936,3,0,0,0,0,8,0,0,0,1165.83,-1719.55,60.9121,2.1369,"Joseph Redpath's Monument - On Gameobject State Changed - Summon Creature 'Joseph Redpath'"),
+(176145,1,1,0,70,0,100,1,2,0,0,0,1,2,0,0,0,0,0,19,10936,0,0,0,0,0,0,"Joseph Redpath's Monument - On Gameobject State Changed - Say Line 2 (Joseph Redpath)");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=10936 AND `GroupID`=2;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10936,2,0,"Save me...",15,0,100,0,0,0,6274,0,"Joseph Redpath");
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_10_world_from_335_was_2018_04_04_08_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_10_world_from_335_was_2018_04_04_08_world_335.sql
new file mode 100644
index 00000000000..68204faab1f
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_10_world_from_335_was_2018_04_04_08_world_335.sql
@@ -0,0 +1,10 @@
+/*
+-- 
+DELETE FROM `game_event_creature` WHERE (`eventEntry`=55 AND `guid`=70996) OR (`eventEntry`=56 AND `guid` IN (75914, 79018, 75475, 88156));
+INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES
+(55, 70996),
+(56, 75914),
+(56, 79018),
+(56, 75475),
+(56, 88156);
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_11_world_from_335_was_2018_04_06_00_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_11_world_from_335_was_2018_04_06_00_world_335.sql
new file mode 100644
index 00000000000..0bb3aff021b
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_11_world_from_335_was_2018_04_06_00_world_335.sql
@@ -0,0 +1,13 @@
+/*
+-- Augustus the Touched
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=12384;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=12384 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
+(12384,0,0,0,1,0,100,0,1000,15000,150000,180000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Augustus the Touched - Out of Combat - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=12384;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(12384,0,0,"You won't find better prices anywhere!",14,0,100,22,0,0,7627,0,"Augustus the Touched"),
+(12384,0,1,"I'm Augustus, and my prices are INSANE!",14,0,100,22,0,0,7628,0,"Augustus the Touched"),
+(12384,0,2,"I'm Augustus!  You want it, I got it!  You wanna sell it, then I want it!",14,0,100,22,0,0,7629,0,"Augustus the Touched");
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_12_world_from_335_was_2018_04_06_01_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_12_world_from_335_was_2018_04_06_01_world_335.sql
new file mode 100644
index 00000000000..b42e707c9fa
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_12_world_from_335_was_2018_04_06_01_world_335.sql
@@ -0,0 +1,10 @@
+/*
+-- Tirion Fordring
+DELETE FROM `gossip_menu` WHERE `MenuID`=3502 AND `TextID`=4673;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(3502,4673,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=3502;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,3502,4673,0,0,9,0,5742,0,0,0,0,0,"","Show gossip text 4673 if quest 'Redemption' is taken");
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_13_world_from_335_was_2018_04_06_02_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_13_world_from_335_was_2018_04_06_02_world_335.sql
new file mode 100644
index 00000000000..ffd5e786a73
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_13_world_from_335_was_2018_04_06_02_world_335.sql
@@ -0,0 +1,36 @@
+/*
+-- Thun'grim Firegaze
+DELETE FROM `creature_text` WHERE `CreatureID`=5878;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5878,0,0,"%s begins to work...",16,0,100,0,0,0,2348,0,"Thun'grim Firegaze"),
+(5878,1,0,"Your armor is ready, $n.",12,1,100,1,0,0,2634,0,"Thun'grim Firegaze");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5878;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5878 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (587800,587801) 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
+(5878,0,0,0,20,0,100,0,1838,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Quest 'Brutal Armor' Finished - Remove Npc Flag Questgiver"),
+(5878,0,1,0,20,0,100,0,1838,0,0,0,53,0,5878,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Quest 'Brutal Armor' Finished - Start Waypoint"),
+(5878,0,2,0,40,0,100,0,3,5878,0,0,80,587800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Waypoint 3 Reached - Run Script"),
+(5878,0,3,0,40,0,100,0,6,5878,0,0,80,587801,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Waypoint 6 Reached - Run Script"),
+(587800,9,0,0,0,0,100,0,0,0,0,0,54,39000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Pause Waypoint"),
+(587800,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,2.92829,"Thun'grim Firegaze - On Script - Set Orientation"),
+(587800,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Say Line 0"),
+(587800,9,3,0,0,0,100,0,0,0,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Set Emote State 69"),
+(587800,9,4,0,0,0,100,0,15000,15000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Set Emote State 0"),
+(587800,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.30012,"Thun'grim Firegaze - On Script - Set Orientation"),
+(587800,9,6,0,0,0,100,0,1000,1000,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Set Emote State 233"),
+(587800,9,7,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Set Emote State 0"),
+(587801,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,0.820305,"Thun'grim Firegaze - On Script - Set Orientation"),
+(587801,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Say Line 1"),
+(587801,9,2,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `waypoints` WHERE `entry`=5878;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(5878,1,-423.713,-3167.24,212.779,""),
+(5878,2,-423.211,-3164.23,212.864,""),
+(5878,3,-425.1,-3162.25,212.697,""),
+(5878,4,-423.211,-3164.23,212.864,""),
+(5878,5,-423.713,-3167.24,212.779,""),
+(5878,6,-437.62,-3176.26,211.385,"");
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_14_world_from_335_was_2018_04_06_03_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_14_world_from_335_was_2018_04_06_03_world_335.sql
new file mode 100644
index 00000000000..63cd132f2c0
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_14_world_from_335_was_2018_04_06_03_world_335.sql
@@ -0,0 +1,21 @@
+/*
+-- Ula'elek
+DELETE FROM `creature_text` WHERE `CreatureID`=6408;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6408,0,0,"%s begins to work...",16,0,100,0,0,0,2348,0,"Ula'elek"),
+(6408,1,0,"I am done.  Your armor is ready, $n.",12,1,100,1,0,0,2646,0,"Ula'elek");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6408;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6408 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=640800 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
+(6408,0,0,0,20,0,100,0,1842,0,0,0,80,640800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Quest 'Satyr Hooves' Finished - Run Script"),
+(640800,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,"Ula'elek - On Script - Remove Npc Flag Questgiver"),
+(640800,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,"Ula'elek - On Script - Say Line 0"),
+(640800,9,2,0,0,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Set Emote State 233"),
+(640800,9,3,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Set Emote State 0"),
+(640800,9,4,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Say Line 1"),
+(640800,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,"Ula'elek - On Script - Add Npc Flag Questgiver");
+
+UPDATE `creature` SET `position_x`=-811.458, `position_y`=-4939.82, `position_z`=20.4816, `orientation`=3.59002 WHERE `guid`=6490;
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_15_world_from_335_was_2018_04_06_04_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_15_world_from_335_was_2018_04_06_04_world_335.sql
new file mode 100644
index 00000000000..c75d2739304
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_15_world_from_335_was_2018_04_06_04_world_335.sql
@@ -0,0 +1,21 @@
+/*
+-- Orm Stonehoof
+DELETE FROM `creature_text` WHERE `CreatureID`=6410;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6410,0,0,"%s begins to work...",16,0,100,0,0,0,2348,0,"Orm Stonehoof"),
+(6410,1,0,"I have completed your helm, $n.",12,1,100,1,0,0,2635,0,"Orm Stonehoof");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6410;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6410 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=641000 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
+(6410,0,0,0,20,0,100,0,1844,0,0,0,80,641000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Quest 'Chimaeric Horn' Finished - Run Script"),
+(641000,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,"Orm Stonehoof - On Script - Remove Npc Flag Questgiver"),
+(641000,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,"Orm Stonehoof - On Script - Say Line 0"),
+(641000,9,2,0,0,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Set Emote State 233"),
+(641000,9,3,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Set Emote State 0"),
+(641000,9,4,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Say Line 1"),
+(641000,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,"Orm Stonehoof - On Script - Add Npc Flag Questgiver");
+
+UPDATE `creature` SET `position_x`=-1239.54, `position_y`=109.707, `position_z`=129.58, `orientation`=1.89658 WHERE `guid`=24678;
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_16_world_from_335_was_2018_04_06_05_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_16_world_from_335_was_2018_04_06_05_world_335.sql
new file mode 100644
index 00000000000..8e60347c0d4
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_16_world_from_335_was_2018_04_06_05_world_335.sql
@@ -0,0 +1,19 @@
+/*
+-- Velora Nitely
+DELETE FROM `creature_text` WHERE `CreatureID`=6411;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6411,0,0,"%s begins to craft...",16,0,100,0,0,0,2644,0,"Velora Nitely"),
+(6411,1,0,"I have finished your leg guards, $n.",12,0,100,1,0,0,2645,0,"Velora Nitely");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6411;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6411 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=641100 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
+(6411,0,0,0,20,0,100,0,1846,0,0,0,80,641100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Quest 'Dragonmaw Shinbones' Finished - Run Script"),
+(641100,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,"Velora Nitely - On Script - Remove Npc Flag Questgiver"),
+(641100,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Say Line 0"),
+(641100,9,2,0,0,0,100,0,0,0,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Set Emote State 133"),
+(641100,9,3,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Set Emote State 0"),
+(641100,9,4,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Say Line 1"),
+(641100,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,"Velora Nitely - On Script - Add Npc Flag Questgiver");
+*/
diff --git a/sql/updates/world/4.3.4/2018_04_06_17_world_from_335_was_2018_04_06_06_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_17_world_from_335_was_2018_04_06_06_world_335.sql
new file mode 100644
index 00000000000..7407de8abca
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_06_17_world_from_335_was_2018_04_06_06_world_335.sql
@@ -0,0 +1,25 @@
+/*
+-- Brutal Armor set Quest chaining
+UPDATE `quest_template` SET `AllowableRaces`=16 WHERE `ID`=1841;
+UPDATE `quest_template` SET `AllowableRaces`=32 WHERE `ID`=1840;
+UPDATE `quest_template` SET `AllowableRaces`=2|128 WHERE `ID`=1839;
+UPDATE `quest_template_addon` SET `PrevQuestID`=1848 WHERE `ID` IN (1841,1840,1839,1846,1844,1842);
+
+-- BreadCrumb Quest "Velora Nitely and the Brutal Legguards"
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (1841,1846);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19,0,1841,0,0,14,0,1846,0,0,0,0,0,"","Quest 'Velora Nitely and the Brutal Legguards' can only be taken if quest 'Dragonmaw Shinbones' is not taken"),
+(19,0,1846,0,0,28,0,1841,0,0,1,0,0,"","Quest 'Dragonmaw Shinbones' can only be taken if quest 'Velora Nitely and the Brutal Legguards' is not completed");
+
+-- BreadCrumb Quest "Orm Stonehoof and the Brutal Helm"
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (1840,1844);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19,0,1840,0,0,14,0,1844,0,0,0,0,0,"","Quest 'Orm Stonehoof and the Brutal Helm' can only be taken if quest 'Chimaeric Horn' is not taken"),
+(19,0,1844,0,0,28,0,1840,0,0,1,0,0,"","Quest 'Chimaeric Horn' can only be taken if quest 'Orm Stonehoof and the Brutal Helm' is not completed");
+
+-- BreadCrumb Quest "Ula'elek and the Brutal Gauntlets"
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (1839,1842);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19,0,1839,0,0,14,0,1842,0,0,0,0,0,"","Quest 'Ula'elek and the Brutal Gauntlets' can only be taken if quest 'Satyr Hooves' is not taken"),
+(19,0,1842,0,0,28,0,1839,0,0,1,0,0,"","Quest 'Satyr Hooves' can only be taken if quest 'Ula'elek and the Brutal Gauntlets' is not completed");
+*/
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp
index 3361c23149b..1a072922a7f 100644
--- a/src/server/database/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp
@@ -31,7 +31,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
     PrepareStatement(CHAR_SEL_CHECK_GUID, "SELECT 1 FROM characters WHERE guid = ?", CONNECTION_SYNCH);
     PrepareStatement(CHAR_SEL_SUM_CHARS, "SELECT COUNT(guid) FROM characters WHERE account = ?", CONNECTION_BOTH);
     PrepareStatement(CHAR_SEL_CHAR_CREATE_INFO, "SELECT level, race, class FROM characters WHERE account = ? LIMIT 0, ?", CONNECTION_ASYNC);
-    PrepareStatement(CHAR_INS_CHARACTER_BAN, "INSERT INTO character_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC);
+    PrepareStatement(CHAR_INS_CHARACTER_BAN, "INSERT INTO character_banned (guid, bandate, unbandate, bannedby, banreason, active) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC);
     PrepareStatement(CHAR_UPD_CHARACTER_BAN, "UPDATE character_banned SET active = 0 WHERE guid = ? AND active != 0", CONNECTION_ASYNC);
     PrepareStatement(CHAR_DEL_CHARACTER_BAN, "DELETE cb FROM character_banned cb INNER JOIN characters c ON c.guid = cb.guid WHERE c.account = ?", CONNECTION_ASYNC);
     PrepareStatement(CHAR_SEL_BANINFO, "SELECT bandate, unbandate-bandate, active, unbandate, banreason, bannedby FROM character_banned WHERE guid = ? ORDER BY bandate ASC", CONNECTION_SYNCH);
diff --git a/src/server/database/Database/Implementation/LoginDatabase.cpp b/src/server/database/Database/Implementation/LoginDatabase.cpp
index 00baae69568..139f1388fe7 100644
--- a/src/server/database/Database/Implementation/LoginDatabase.cpp
+++ b/src/server/database/Database/Implementation/LoginDatabase.cpp
@@ -34,7 +34,7 @@ void LoginDatabaseConnection::DoPrepareStatements()
     PrepareStatement(LOGIN_SEL_IP_BANNED_BY_IP, "SELECT ip, bandate, unbandate, bannedby, banreason FROM ip_banned WHERE (bandate = unbandate OR unbandate > UNIX_TIMESTAMP()) AND ip LIKE CONCAT('%%', ?, '%%') ORDER BY unbandate", CONNECTION_SYNCH);
     PrepareStatement(LOGIN_SEL_ACCOUNT_BANNED_ALL, "SELECT account.id, username FROM account, account_banned WHERE account.id = account_banned.id AND active = 1 GROUP BY account.id", CONNECTION_SYNCH);
     PrepareStatement(LOGIN_SEL_ACCOUNT_BANNED_BY_USERNAME, "SELECT account.id, username FROM account, account_banned WHERE account.id = account_banned.id AND active = 1 AND username LIKE CONCAT('%%', ?, '%%') GROUP BY account.id", CONNECTION_SYNCH);
-    PrepareStatement(LOGIN_INS_ACCOUNT_AUTO_BANNED, "INSERT INTO account_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, 'Trinity Auth', 'Failed login autoban', 1)", CONNECTION_ASYNC);
+    PrepareStatement(LOGIN_INS_ACCOUNT_AUTO_BANNED, "INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, 'Trinity Auth', 'Failed login autoban', 1)", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_DEL_ACCOUNT_BANNED, "DELETE FROM account_banned WHERE id = ?", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_UPD_VS, "UPDATE account SET v = ?, s = ? WHERE username = ?", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_UPD_LOGONPROOF, "UPDATE account SET sessionkey = ?, last_ip = ?, last_login = NOW(), locale = ?, failed_logins = 0, os = ? WHERE username = ?", CONNECTION_SYNCH);
@@ -60,7 +60,7 @@ void LoginDatabaseConnection::DoPrepareStatements()
     PrepareStatement(LOGIN_SEL_ACCOUNT_BY_ID, "SELECT 1 FROM account WHERE id = ?", CONNECTION_SYNCH);
     PrepareStatement(LOGIN_INS_IP_BANNED, "INSERT INTO ip_banned (ip, bandate, unbandate, bannedby, banreason) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?)", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_DEL_IP_NOT_BANNED, "DELETE FROM ip_banned WHERE ip = ?", CONNECTION_ASYNC);
-    PrepareStatement(LOGIN_INS_ACCOUNT_BANNED, "INSERT INTO account_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC);
+    PrepareStatement(LOGIN_INS_ACCOUNT_BANNED, "INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_UPD_ACCOUNT_NOT_BANNED, "UPDATE account_banned SET active = 0 WHERE id = ? AND active != 0", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_DEL_REALM_CHARACTERS_BY_REALM, "DELETE FROM realmcharacters WHERE acctid = ? AND realmid = ?", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_DEL_REALM_CHARACTERS, "DELETE FROM realmcharacters WHERE acctid = ?", CONNECTION_ASYNC);
diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp
index 27e64a47b49..1160fc3143c 100644
--- a/src/server/game/Battlegrounds/ArenaTeam.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeam.cpp
@@ -18,6 +18,7 @@
 
 #include "ArenaTeam.h"
 #include "ArenaTeamMgr.h"
+#include "BattlegroundMgr.h"
 #include "CharacterCache.h"
 #include "DatabaseEnv.h"
 #include "Group.h"
@@ -314,9 +315,33 @@ void ArenaTeam::SetCaptain(ObjectGuid guid)
 
 void ArenaTeam::DelMember(ObjectGuid guid, bool cleanDb)
 {
+    Player* player = ObjectAccessor::FindConnectedPlayer(guid);
+    Group* group = (player && player->GetGroup()) ? player->GetGroup() : nullptr;
+
     // Remove member from team
     for (MemberList::iterator itr = Members.begin(); itr != Members.end(); ++itr)
     {
+        // Remove queues of members
+        if (Player* playerMember = ObjectAccessor::FindConnectedPlayer(itr->Guid))
+        {
+            if (group && playerMember->GetGroup() && group->GetGUID() == playerMember->GetGroup()->GetGUID())
+            {
+                if (BattlegroundQueueTypeId bgQueue = BattlegroundMgr::BGQueueTypeId(BATTLEGROUND_AA, GetType()))
+                {
+                    GroupQueueInfo ginfo;
+                    BattlegroundQueue& queue = sBattlegroundMgr->GetBattlegroundQueue(bgQueue);
+                    if (queue.GetPlayerGroupInfoData(playerMember->GetGUID(), &ginfo))
+                        if (!ginfo.IsInvitedToBGInstanceGUID)
+                        {
+                            WorldPacket data;
+                            playerMember->RemoveBattlegroundQueueId(bgQueue);
+                            sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, nullptr, playerMember, playerMember->GetBattlegroundQueueIndex(bgQueue), STATUS_NONE, 0, 0, GetType());
+                            queue.RemovePlayer(playerMember->GetGUID(), true);
+                            playerMember->GetSession()->SendPacket(&data);
+                        }
+                }
+            }
+        }
         if (itr->Guid == guid)
         {
             Members.erase(itr);
@@ -326,7 +351,7 @@ void ArenaTeam::DelMember(ObjectGuid guid, bool cleanDb)
     }
 
     // Remove arena team info from player data
-    if (Player* player = ObjectAccessor::FindPlayer(guid))
+    if (player)
     {
         // delete all info regarding this team
         for (uint32 i = 0; i < ARENA_TEAM_END; ++i)
diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp
index 98a1d7f7857..134d3a6797c 100644
--- a/src/server/game/Chat/ChatLink.cpp
+++ b/src/server/game/Chat/ChatLink.cpp
@@ -578,7 +578,7 @@ bool LinkExtractor::IsValidMessage()
             break;
 
         char commandChar;
-        _iss >> commandChar;
+        _iss.get(commandChar);
 
         // | in normal messages is escaped by ||
         if (commandChar != PIPE_CHAR)
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 02e4cc51afb..75be14cd040 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -24,6 +24,7 @@
 #include "UnitEvents.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
+#include "TemporarySummon.h"
 
 //==============================================================
 //================= ThreatCalcHelper ===========================
@@ -414,11 +415,28 @@ void ThreatManager::addThreat(Unit* victim, float threat, SpellSchoolMask school
 void ThreatManager::doAddThreat(Unit* victim, float threat)
 {
     uint32 redirectThreadPct = victim->GetRedirectThreatPercent();
+    Unit* redirectTarget = victim->GetRedirectThreatTarget();
+
+    // If victim is personal spawn, redirect all aggro to summoner
+    if (TempSummon* tempSummonVictim = victim->ToTempSummon())
+    {
+        if (tempSummonVictim->IsVisibleBySummonerOnly())
+        {
+            // Personnal Spawns from same summoner can aggro each other
+            if (!GetOwner()->ToTempSummon() ||
+                !GetOwner()->ToTempSummon()->IsVisibleBySummonerOnly() ||
+                tempSummonVictim->GetSummonerGUID() != GetOwner()->ToTempSummon()->GetSummonerGUID())
+            {
+                redirectThreadPct = 100;
+                redirectTarget = tempSummonVictim->GetSummoner();
+            }
+        }
+    }
 
     // must check > 0.0f, otherwise dead loop
     if (threat > 0.0f && redirectThreadPct)
     {
-        if (Unit* redirectTarget = victim->GetRedirectThreatTarget())
+        if (redirectTarget)
         {
             float redirectThreat = CalculatePct(threat, redirectThreadPct);
             threat -= redirectThreat;
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index 18eeb8995f9..cbbd1b30704 100644
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -570,7 +570,7 @@ enum SummonPropFlags
     SUMMON_PROP_FLAG_UNK2            = 0x00000002,          // 616 spells in 3.0.3, something friendly
     SUMMON_PROP_FLAG_UNK3            = 0x00000004,          // 22 spells in 3.0.3, no idea...
     SUMMON_PROP_FLAG_UNK4            = 0x00000008,          // 49 spells in 3.0.3, some mounts
-    SUMMON_PROP_FLAG_UNK5            = 0x00000010,          // 25 spells in 3.0.3, quest related?
+    SUMMON_PROP_FLAG_PERSONAL_SPAWN  = 0x00000010,          // Personal Spawn (creature visible only by summoner)
     SUMMON_PROP_FLAG_UNK6            = 0x00000020,          // 0 spells in 3.3.5, unused
     SUMMON_PROP_FLAG_UNK7            = 0x00000040,          // 12 spells in 3.0.3, no idea
     SUMMON_PROP_FLAG_UNK8            = 0x00000080,          // 4 spells in 3.0.3, no idea
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 57f186d2974..e1f54969b67 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2391,11 +2391,7 @@ void Creature::SetInCombatWithZone()
 
 bool Creature::HasSpell(uint32 spellID) const
 {
-    uint8 i;
-    for (i = 0; i < MAX_CREATURE_SPELLS; ++i)
-        if (spellID == m_spells[i])
-            break;
-    return i < MAX_CREATURE_SPELLS;                         //broke before end of iteration of known spells
+    return std::find(std::begin(m_spells), std::end(m_spells), spellID) != std::end(m_spells);
 }
 
 time_t Creature::GetRespawnTimeEx() const
diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h
index f95e7d669ed..ca079ae434b 100644
--- a/src/server/game/Entities/Creature/CreatureData.h
+++ b/src/server/game/Entities/Creature/CreatureData.h
@@ -43,7 +43,7 @@ enum CreatureFlagsExtra : uint32
     CREATURE_FLAG_EXTRA_NO_MOVE_FLAGS_UPDATE = 0x00000200,       // creature won't update movement flags
     CREATURE_FLAG_EXTRA_GHOST_VISIBILITY     = 0x00000400,       // creature will be only visible for dead players
     CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK   = 0x00000800,       // creature will use offhand attacks
-    CREATURE_FLAG_EXTRA_UNUSED_12            = 0x00001000,
+    CREATURE_FLAG_EXTRA_NO_SELL_VENDOR       = 0x00001000,       // players can't sell items to this vendor
     CREATURE_FLAG_EXTRA_UNUSED_13            = 0x00002000,
     CREATURE_FLAG_EXTRA_WORLDEVENT           = 0x00004000,       // custom flag for world event creatures (left room for merging)
     CREATURE_FLAG_EXTRA_GUARD                = 0x00008000,       // Creature is guard
@@ -65,10 +65,9 @@ enum CreatureFlagsExtra : uint32
     CREATURE_FLAG_EXTRA_UNUSED_31            = 0x80000000,
 
     // Masks
-    CREATURE_FLAG_EXTRA_UNUSED               = (CREATURE_FLAG_EXTRA_UNUSED_12 | CREATURE_FLAG_EXTRA_UNUSED_13 | CREATURE_FLAG_EXTRA_UNUSED_16 |
-                                                CREATURE_FLAG_EXTRA_UNUSED_22 | CREATURE_FLAG_EXTRA_UNUSED_23 | CREATURE_FLAG_EXTRA_UNUSED_24 |
-                                                CREATURE_FLAG_EXTRA_UNUSED_25 | CREATURE_FLAG_EXTRA_UNUSED_26 | CREATURE_FLAG_EXTRA_UNUSED_27 |
-                                                CREATURE_FLAG_EXTRA_UNUSED_31),
+    CREATURE_FLAG_EXTRA_UNUSED               = (CREATURE_FLAG_EXTRA_UNUSED_13 | CREATURE_FLAG_EXTRA_UNUSED_16 | CREATURE_FLAG_EXTRA_UNUSED_22 |
+                                                CREATURE_FLAG_EXTRA_UNUSED_23 | CREATURE_FLAG_EXTRA_UNUSED_24 | CREATURE_FLAG_EXTRA_UNUSED_25 |
+                                                CREATURE_FLAG_EXTRA_UNUSED_26 | CREATURE_FLAG_EXTRA_UNUSED_27 | CREATURE_FLAG_EXTRA_UNUSED_31),
 
     CREATURE_FLAG_EXTRA_DB_ALLOWED           = (0xFFFFFFFF & ~(CREATURE_FLAG_EXTRA_UNUSED | CREATURE_FLAG_EXTRA_DUNGEON_BOSS))
 };
diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
index 5f5cf4b7d37..f3882a8f171 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.cpp
+++ b/src/server/game/Entities/Creature/TemporarySummon.cpp
@@ -27,7 +27,7 @@
 
 TempSummon::TempSummon(SummonPropertiesEntry const* properties, Unit* owner, bool isWorldObject) :
 Creature(isWorldObject), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN),
-m_timer(0), m_lifetime(0)
+m_timer(0), m_lifetime(0), m_visibleBySummonerOnly(false)
 {
     if (owner)
         m_summonerGUID = owner->GetGUID();
diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h
index e0584339c6d..0dfa8635d10 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.h
+++ b/src/server/game/Entities/Creature/TemporarySummon.h
@@ -69,12 +69,16 @@ class TC_GAME_API TempSummon : public Creature
         TempSummonType const& GetSummonType() { return m_type; }
         uint32 GetTimer() const { return m_timer; }
 
+        void SetVisibleBySummonerOnly(bool visibleBySummonerOnly) { m_visibleBySummonerOnly = visibleBySummonerOnly; }
+        bool IsVisibleBySummonerOnly() const { return m_visibleBySummonerOnly; }
+
         SummonPropertiesEntry const* const m_Properties;
     private:
         TempSummonType m_type;
         uint32 m_timer;
         uint32 m_lifetime;
         ObjectGuid m_summonerGUID;
+        bool m_visibleBySummonerOnly;
 };
 
 class TC_GAME_API Minion : public TempSummon
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index f1b1ca3ce1c..4f24bd3a5e6 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -2500,7 +2500,7 @@ void GameObject::UpdateModelPosition()
 class GameObjectModelOwnerImpl : public GameObjectModelOwnerBase
 {
 public:
-    explicit GameObjectModelOwnerImpl(GameObject const* owner) : _owner(owner) { }
+    explicit GameObjectModelOwnerImpl(GameObject* owner) : _owner(owner) { }
 
     virtual bool IsSpawned() const override { return _owner->isSpawned(); }
     virtual uint32 GetDisplayId() const override { return _owner->GetDisplayId(); }
@@ -2511,7 +2511,7 @@ public:
     virtual void DebugVisualizeCorner(G3D::Vector3 const& corner) const override { _owner->SummonCreature(1, corner.x, corner.y, corner.z, 0, TEMPSUMMON_MANUAL_DESPAWN); }
 
 private:
-    GameObject const* _owner;
+    GameObject* _owner;
 };
 
 GameObjectModel* GameObject::CreateModel()
diff --git a/src/server/game/Entities/Item/ItemDefines.h b/src/server/game/Entities/Item/ItemDefines.h
index b0ff4e24208..06428e990fc 100644
--- a/src/server/game/Entities/Item/ItemDefines.h
+++ b/src/server/game/Entities/Item/ItemDefines.h
@@ -132,12 +132,13 @@ enum BuyResult
 
 enum SellResult
 {
-    SELL_ERR_CANT_FIND_ITEM                      = 1,
-    SELL_ERR_CANT_SELL_ITEM                      = 2,       // merchant doesn't like that item
-    SELL_ERR_CANT_FIND_VENDOR                    = 3,       // merchant doesn't like you
-    SELL_ERR_YOU_DONT_OWN_THAT_ITEM              = 4,       // you don't own that item
+    SELL_ERR_CANT_FIND_ITEM                      = 1,       // The item was not found.
+    SELL_ERR_CANT_SELL_ITEM                      = 2,       // The merchant doesn't want that item.
+    SELL_ERR_CANT_FIND_VENDOR                    = 3,       // The merchant doesn't like you.
+    SELL_ERR_YOU_DONT_OWN_THAT_ITEM              = 4,       // You don't own that item.
     SELL_ERR_UNK                                 = 5,       // nothing appears...
-    SELL_ERR_ONLY_EMPTY_BAG                      = 6        // can only do with empty bags
+    SELL_ERR_ONLY_EMPTY_BAG                      = 6,       // You can only do that with empty bags.
+    SELL_ERR_CANT_SELL_TO_THIS_MERCHANT          = 7        // You cannot sell items to this merchant.
 };
 
 // -1 from client enchantment slot number
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 0a90e590232..795587c1f49 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1171,7 +1171,7 @@ void Object::ApplyModFlag64(uint16 index, uint64 flag, bool apply)
 
 bool Object::PrintIndexError(uint32 index, bool set) const
 {
-    TC_LOG_ERROR("misc", "Attempt %s non-existed value field: %u (count: %u) for object typeid: %u type mask: %u", (set ? "set value to" : "get value from"), index, m_valuesCount, GetTypeId(), m_objectType);
+    TC_LOG_ERROR("misc", "Attempt to %s non-existing value field: %u (count: %u) for object typeid: %u type mask: %u", (set ? "set value to" : "get value from"), index, m_valuesCount, GetTypeId(), m_objectType);
 
     // ASSERT must fail after function call
     return false;
@@ -1795,8 +1795,15 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
 
         WorldObject const* viewpoint = this;
         if (Player const* player = this->ToPlayer())
+        {
             viewpoint = player->GetViewpoint();
 
+            if (Creature const* creature = obj->ToCreature())
+                if (TempSummon const* tempSummon = creature->ToTempSummon())
+                    if (tempSummon->IsVisibleBySummonerOnly() && GetGUID() != tempSummon->GetSummonerGUID())
+                        return false;
+        }
+
         if (!viewpoint)
             viewpoint = this;
 
@@ -2035,7 +2042,7 @@ void WorldObject::AddObjectToRemoveList()
     map->AddObjectToRemoveList(this);
 }
 
-TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropertiesEntry const* properties /*= nullptr*/, uint32 duration /*= 0*/, Unit* summoner /*= nullptr*/, uint32 spellId /*= 0*/, uint32 vehId /*= 0*/)
+TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropertiesEntry const* properties /*= NULL*/, uint32 duration /*= 0*/, Unit* summoner /*= NULL*/, uint32 spellId /*= 0*/, uint32 vehId /*= 0*/, bool visibleBySummonerOnly /*= false*/)
 {
     uint32 mask = UNIT_MASK_SUMMON;
     if (properties)
@@ -2120,6 +2127,9 @@ TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropert
     summon->SetHomePosition(pos);
 
     summon->InitStats(duration);
+
+    summon->SetVisibleBySummonerOnly(visibleBySummonerOnly);
+
     AddToMap(summon->ToCreature());
     summon->InitSummon();
 
@@ -2170,11 +2180,11 @@ void WorldObject::ClearZoneScript()
     m_zoneScript = nullptr;
 }
 
-TempSummon* WorldObject::SummonCreature(uint32 entry, Position const& pos, TempSummonType spwtype /*= TEMPSUMMON_MANUAL_DESPAWN*/, uint32 duration /*= 0*/, uint32 /*vehId = 0*/) const
+TempSummon* WorldObject::SummonCreature(uint32 entry, Position const& pos, TempSummonType spwtype /*= TEMPSUMMON_MANUAL_DESPAWN*/, uint32 duration /*= 0*/, uint32 vehId /*= 0*/, bool visibleBySummonerOnly /*= false*/)
 {
     if (Map* map = FindMap())
     {
-        if (TempSummon* summon = map->SummonCreature(entry, pos, nullptr, duration, isType(TYPEMASK_UNIT) ? (Unit*)this : nullptr))
+        if (TempSummon* summon = map->SummonCreature(entry, pos, nullptr, duration, ToUnit(), 0, vehId, visibleBySummonerOnly))
         {
             summon->SetTempSummonType(spwtype);
             return summon;
@@ -2184,7 +2194,7 @@ TempSummon* WorldObject::SummonCreature(uint32 entry, Position const& pos, TempS
     return nullptr;
 }
 
-TempSummon* WorldObject::SummonCreature(uint32 id, float x, float y, float z, float ang /*= 0*/, TempSummonType spwtype /*= TEMPSUMMON_MANUAL_DESPAWN*/, uint32 despwtime /*= 0*/) const
+TempSummon* WorldObject::SummonCreature(uint32 id, float x, float y, float z, float ang /*= 0*/, TempSummonType spwtype /*= TEMPSUMMON_MANUAL_DESPAWN*/, uint32 despwtime /*= 0*/, bool visibleBySummonerOnly /*= false*/)
 {
     if (!x && !y && !z)
     {
@@ -2194,7 +2204,7 @@ TempSummon* WorldObject::SummonCreature(uint32 id, float x, float y, float z, fl
 
     Position pos;
     pos.Relocate(x, y, z, ang);
-    return SummonCreature(id, pos, spwtype, despwtime, 0);
+    return SummonCreature(id, pos, spwtype, despwtime, 0, visibleBySummonerOnly);
 }
 
 GameObject* WorldObject::SummonGameObject(uint32 entry, Position const& pos, QuaternionData const& rot, uint32 respawnTime, GOSummonType summonType)
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index 53b0c8d1744..f9cf002cce2 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -392,8 +392,8 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
         void ClearZoneScript();
         ZoneScript* GetZoneScript() const { return m_zoneScript; }
 
-        TempSummon* SummonCreature(uint32 id, Position const& pos, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0, uint32 vehId = 0) const;
-        TempSummon* SummonCreature(uint32 id, float x, float y, float z, float ang = 0, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0) const;
+        TempSummon* SummonCreature(uint32 id, Position const& pos, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0, uint32 vehId = 0, bool visibleBySummonerOnly = false);
+        TempSummon* SummonCreature(uint32 id, float x, float y, float z, float ang = 0, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0, bool visibleBySummonerOnly = false);
         GameObject* SummonGameObject(uint32 entry, Position const& pos, QuaternionData const& rot, uint32 respawnTime /* s */, GOSummonType summonType = GO_SUMMON_TIMED_OR_CORPSE_DESPAWN);
         GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, QuaternionData const& rot, uint32 respawnTime /* s */);
         Creature*   SummonTrigger(float x, float y, float z, float ang, uint32 dur, CreatureAI* (*GetAI)(Creature*) = nullptr);
diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp
index 6916da5bcd4..ca11ab96cf4 100644
--- a/src/server/game/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Handlers/ArenaTeamHandler.cpp
@@ -19,6 +19,7 @@
 #include "WorldSession.h"
 #include "ArenaTeam.h"
 #include "ArenaTeamMgr.h"
+#include "BattlegroundMgr.h"
 #include "CharacterCache.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
@@ -287,6 +288,19 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket& recvData)
         return;
     }
 
+    // Player cannot be removed during queues
+    if (BattlegroundQueueTypeId bgQueue = BattlegroundMgr::BGQueueTypeId(BATTLEGROUND_AA, arenaTeam->GetType()))
+    {
+        GroupQueueInfo ginfo;
+        BattlegroundQueue& queue = sBattlegroundMgr->GetBattlegroundQueue(bgQueue);
+        if (queue.GetPlayerGroupInfoData(_player->GetGUID(), &ginfo))
+            if (ginfo.IsInvitedToBGInstanceGUID)
+            {
+                SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAMS_LOCKED);
+                return;
+            }
+    }
+
     // If team consists only of the captain, disband the team
     if (_player->GetGUID() == arenaTeam->GetCaptain())
     {
@@ -317,6 +331,16 @@ void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket& recvData)
         if (arenaTeam->GetCaptain() != _player->GetGUID())
             return;
 
+        // Teams cannot be disbanded during queues
+        if (BattlegroundQueueTypeId bgQueue = BattlegroundMgr::BGQueueTypeId(BATTLEGROUND_AA, arenaTeam->GetType()))
+        {
+            GroupQueueInfo ginfo;
+            BattlegroundQueue& queue = sBattlegroundMgr->GetBattlegroundQueue(bgQueue);
+            if (queue.GetPlayerGroupInfoData(_player->GetGUID(), &ginfo))
+                if (ginfo.IsInvitedToBGInstanceGUID)
+                    return;
+        }
+
         // Teams cannot be disbanded during fights
         if (arenaTeam->IsFighting())
             return;
@@ -366,6 +390,19 @@ void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket& recvData)
         return;
     }
 
+    // Team cannot be removed during queues
+    if (BattlegroundQueueTypeId bgQueue = BattlegroundMgr::BGQueueTypeId(BATTLEGROUND_AA, arenaTeam->GetType()))
+    {
+        GroupQueueInfo ginfo;
+        BattlegroundQueue& queue = sBattlegroundMgr->GetBattlegroundQueue(bgQueue);
+        if (queue.GetPlayerGroupInfoData(_player->GetGUID(), &ginfo))
+            if (ginfo.IsInvitedToBGInstanceGUID)
+            {
+                SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAMS_LOCKED);
+                return;
+            }
+    }
+
     // Player cannot be removed during fights
     if (arenaTeam->IsFighting())
         return;
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index 1a6beb81bb7..5254c7e1347 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -357,6 +357,12 @@ void WorldSession::HandleSellItemOpcode(WorldPacket& recvData)
         return;
     }
 
+    if ((creature->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_SELL_VENDOR) != 0)
+    {
+        _player->SendSellError(SELL_ERR_CANT_SELL_TO_THIS_MERCHANT, creature, itemguid);
+        return;
+    }
+
     // remove fake death
     if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 57b56e02d59..31ee265d845 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -436,7 +436,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType>
 
         void UpdateIteratorBack(Player* player);
 
-        TempSummon* SummonCreature(uint32 entry, Position const& pos, SummonPropertiesEntry const* properties = nullptr, uint32 duration = 0, Unit* summoner = nullptr, uint32 spellId = 0, uint32 vehId = 0);
+        TempSummon* SummonCreature(uint32 entry, Position const& pos, SummonPropertiesEntry const* properties = NULL, uint32 duration = 0, Unit* summoner = NULL, uint32 spellId = 0, uint32 vehId = 0, bool visibleOnlyBySummoner = false);
         void SummonCreatureGroup(uint8 group, std::list<TempSummon*>* list = nullptr);
         Player* GetPlayer(ObjectGuid const& guid);
         AreaTrigger* GetAreaTrigger(ObjectGuid const& guid);
diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp
index d1ece831345..7fcbcc7566d 100644
--- a/src/server/game/Scripting/ScriptReloadMgr.cpp
+++ b/src/server/game/Scripting/ScriptReloadMgr.cpp
@@ -17,6 +17,7 @@
 
 #include "ScriptReloadMgr.h"
 #include "Errors.h"
+#include "Optional.h"
 
 #ifndef TRINITY_API_USE_DYNAMIC_LINKING
 
@@ -36,31 +37,30 @@ ScriptReloadMgr* ScriptReloadMgr::instance()
 
 #else
 
-#include <algorithm>
-#include <vector>
-#include <future>
-#include <memory>
-#include <fstream>
-#include <type_traits>
-#include <unordered_set>
-#include <unordered_map>
-
-#include "Regex.h"
-
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/system/system_error.hpp>
-
-#include "efsw/efsw.hpp"
-
-#include "Log.h"
-#include "Config.h"
 #include "BuiltInConfig.h"
+#include "Config.h"
+#include "GitRevision.h"
+#include "Log.h"
+#include "MPSCQueue.h"
+#include "Regex.h"
 #include "ScriptMgr.h"
 #include "SHA1.h"
 #include "StartProcess.h"
-#include "MPSCQueue.h"
-#include "GitRevision.h"
+#include "Timer.h"
+#include "World.h"
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/system/system_error.hpp>
+#include <efsw/efsw.hpp>
+#include <algorithm>
+#include <fstream>
+#include <future>
+#include <memory>
+#include <sstream>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 namespace fs = boost::filesystem;
 
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 61f43e6ed09..3360c8f8dce 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -992,6 +992,10 @@ bool Aura::CanBeSaved() const
             return false;
     }
 
+    // don't save liquid auras
+    if (GetSpellInfo()->HasAttribute(SPELL_ATTR0_CU_LIQUID_AURA))
+        return false;
+
     // Can't be saved - aura handler relies on calculated amount and changes it
     if (HasEffectType(SPELL_AURA_CONVERT_RUNE))
         return false;
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index b01cc226c32..52167fc1c9a 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -2013,6 +2013,8 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
     if (!m_originalCaster)
         return;
 
+    bool personalSpawn = (properties->Flags & SUMMON_PROP_FLAG_PERSONAL_SPAWN) != 0;
+
     int32 duration = m_spellInfo->GetDuration();
     if (Player* modOwner = m_originalCaster->GetSpellModOwner())
         modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration);
@@ -2076,7 +2078,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
                 case SUMMON_TYPE_LIGHTWELL:
                 case SUMMON_TYPE_TOTEM:
                 {
-                    summon = m_caster->GetMap()->SummonCreature(entry, *destTarget, properties, duration, m_originalCaster, m_spellInfo->Id);
+                    summon = m_caster->GetMap()->SummonCreature(entry, *destTarget, properties, duration, m_originalCaster, m_spellInfo->Id, 0, personalSpawn);
                     if (!summon || !summon->IsTotem())
                         return;
 
@@ -2093,7 +2095,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
                 }
                 case SUMMON_TYPE_MINIPET:
                 {
-                    summon = m_caster->GetMap()->SummonCreature(entry, *destTarget, properties, duration, m_originalCaster, m_spellInfo->Id);
+                    summon = m_caster->GetMap()->SummonCreature(entry, *destTarget, properties, duration, m_originalCaster, m_spellInfo->Id, 0, personalSpawn);
                     if (!summon || !summon->HasUnitTypeMask(UNIT_MASK_MINION))
                         return;
 
@@ -2120,7 +2122,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
                             // randomize position for multiple summons
                             pos = m_caster->GetRandomPoint(*destTarget, radius);
 
-                        summon = m_originalCaster->SummonCreature(entry, pos, summonType, duration);
+                        summon = m_originalCaster->SummonCreature(entry, pos, summonType, duration, 0, personalSpawn);
                         if (!summon)
                             continue;
 
@@ -2141,7 +2143,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
             SummonGuardian(effIndex, entry, properties, numSummons);
             break;
         case SUMMON_CATEGORY_PUPPET:
-            summon = m_caster->GetMap()->SummonCreature(entry, *destTarget, properties, duration, m_originalCaster, m_spellInfo->Id);
+            summon = m_caster->GetMap()->SummonCreature(entry, *destTarget, properties, duration, m_originalCaster, m_spellInfo->Id, 0, personalSpawn);
             break;
         case SUMMON_CATEGORY_VEHICLE:
             // Summoning spells (usually triggered by npc_spellclick) that spawn a vehicle and that cause the clicker
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 84db59f9e42..b9c06fa8eb7 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -3555,6 +3555,9 @@ bool SpellInfo::_IsPositiveEffect(uint8 effIndex, bool deep) const
             if (SpellIconID == 45)
                 return true;
             // Arcane Missiles
+            if (SpellFamilyFlags[0] == 0x00000800)
+                return false;
+            // Arcane Missiles
             if (SpellFamilyFlags[0] == 0x00000800)
                 return false;
             break;
diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h
index 8746ccceb2f..3303bd2a6a4 100644
--- a/src/server/game/Spells/SpellInfo.h
+++ b/src/server/game/Spells/SpellInfo.h
@@ -192,6 +192,7 @@ enum SpellCustomAttributes
     SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER      = 0x00010000,
     SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET      = 0x00020000,
     SPELL_ATTR0_CU_ALLOW_INFLIGHT_TARGET         = 0x00040000,
+    SPELL_ATTR0_CU_LIQUID_AURA                   = 0x00400000,
 
     SPELL_ATTR0_CU_NEGATIVE                      = SPELL_ATTR0_CU_NEGATIVE_EFF0 | SPELL_ATTR0_CU_NEGATIVE_EFF1 | SPELL_ATTR0_CU_NEGATIVE_EFF2
 };
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 833207ae752..de8a62920c8 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1908,6 +1908,11 @@ void SpellMgr::LoadSpellProcs()
                 case SPELL_AURA_MOD_BLOCK_PERCENT:
                     procEntry.HitMask = PROC_HIT_BLOCK;
                     break;
+                // proc auras with another aura reducing hit chance (eg 63767) only proc on missed attack
+                case SPELL_AURA_MOD_HIT_CHANCE:
+                    if (spellInfo->Effects[i].CalcValue() <= -100)
+                        procEntry.HitMask = PROC_HIT_MISS;
+                    break;
                 default:
                     continue;
             }
@@ -2804,6 +2809,17 @@ void SpellMgr::LoadSpellInfoCustomAttributes()
         spellInfo->_InitializeExplicitTargetMask();
     }
 
+    // add custom attribute to liquid auras
+    for (LiquidTypeEntry const* liquid : sLiquidTypeStore)
+    {
+        if (liquid->SpellId)
+        {
+            spellInfo = _GetSpellInfo(liquid->SpellId);
+            if (spellInfo)
+                spellInfo->AttributesCu |= SPELL_ATTR0_CU_LIQUID_AURA;
+        }
+    }
+
     TC_LOG_INFO("server.loading", ">> Loaded SpellInfo custom attributes in %u ms", GetMSTimeDiffToNow(oldMSTime));
 }
 
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 942687a3e26..b595167b84f 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2715,18 +2715,20 @@ BanReturn World::BanCharacter(std::string const& name, std::string const& durati
     }
     else
         guid = banned->GetGUID().GetCounter();
-
+    //Use transaction in order to ensure the order of the queries
+    SQLTransaction trans = CharacterDatabase.BeginTransaction();
     // make sure there is only one active ban
     PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER_BAN);
     stmt->setUInt32(0, guid);
-    CharacterDatabase.Execute(stmt);
+    trans->Append(stmt);
 
     stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHARACTER_BAN);
     stmt->setUInt32(0, guid);
     stmt->setUInt32(1, duration_secs);
     stmt->setString(2, author);
     stmt->setString(3, reason);
-    CharacterDatabase.Execute(stmt);
+    trans->Append(stmt);
+    CharacterDatabase.CommitTransaction(trans);
 
     if (banned)
         banned->GetSession()->KickPlayer();
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 8724d09b5ce..7bdd337fc5f 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -50,10 +50,7 @@ struct EnumName
 
 #define CREATE_NAMED_ENUM(VALUE) { VALUE, STRINGIZE(VALUE) }
 
-#define NPCFLAG_COUNT   24
-#define FLAGS_EXTRA_COUNT 21
-
-EnumName<NPCFlags, int32> const npcFlagTexts[NPCFLAG_COUNT] =
+EnumName<NPCFlags, int32> const npcFlagTexts[] =
 {
     { UNIT_NPC_FLAG_AUCTIONEER,         LANG_NPCINFO_AUCTIONEER         },
     { UNIT_NPC_FLAG_BANKER,             LANG_NPCINFO_BANKER             },
@@ -81,6 +78,8 @@ EnumName<NPCFlags, int32> const npcFlagTexts[NPCFLAG_COUNT] =
     { UNIT_NPC_FLAG_VENDOR_REAGENT,     LANG_NPCINFO_VENDOR_REAGENT     }
 };
 
+uint32 const NPCFLAG_COUNT = std::extent<decltype(npcFlagTexts)>::value;
+
 EnumName<Mechanics> const mechanicImmunes[MAX_MECHANIC] =
 {
     CREATE_NAMED_ENUM(MECHANIC_NONE),
@@ -154,7 +153,7 @@ EnumName<UnitFlags> const unitFlags[MAX_UNIT_FLAGS] =
     CREATE_NAMED_ENUM(UNIT_FLAG_UNK_31)
 };
 
-EnumName<CreatureFlagsExtra> const flagsExtra[FLAGS_EXTRA_COUNT] =
+EnumName<CreatureFlagsExtra> const flagsExtra[] =
 {
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_INSTANCE_BIND),
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_CIVILIAN),
@@ -166,6 +165,7 @@ EnumName<CreatureFlagsExtra> const flagsExtra[FLAGS_EXTRA_COUNT] =
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_TRIGGER),
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_NO_TAUNT),
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_NO_MOVE_FLAGS_UPDATE),
+    CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_NO_SELL_VENDOR),
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_WORLDEVENT),
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_GUARD),
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_NO_CRIT),
@@ -179,6 +179,8 @@ EnumName<CreatureFlagsExtra> const flagsExtra[FLAGS_EXTRA_COUNT] =
     CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK)
 };
 
+uint32 const FLAGS_EXTRA_COUNT = std::extent<decltype(flagsExtra)>::value;
+
 class npc_commandscript : public CommandScript
 {
 public:
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 3326b19550d..6c86f8ac729 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -68,9 +68,9 @@ public:
 
         void JustDied(Unit* killer) override
         {
-			if (!killer)
-				return;
-			
+            if (!killer)
+                return;
+
             uint32 spawnCreatureID = 0;
 
             switch (urand(0, 2))
@@ -265,10 +265,10 @@ public:
         {
             me->SetObjectScale(1.0f);
             _events.Reset();
-			
-			if (!killer)
-				return;
-			
+
+            if (!killer)
+                return;
+
             if (Creature* legoso = me->FindNearestCreature(NPC_LEGOSO, SIZE_OF_GRIDS))
             {
                 Group* group = me->GetLootRecipientGroup();
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 2a2a0a685b9..cc4ec80fea4 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -480,7 +480,7 @@ class npc_swarm_scarab : public CreatureScript
 
             void JustDied(Unit* killer) override
             {
-				if (killer)
+                if (killer)
                     DoCast(killer, SPELL_TRAITOR_KING);
             }
 
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index 8c485a8d602..23234001d6c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -202,10 +202,10 @@ class boss_blood_queen_lana_thel : public CreatureScript
                     DoCastAOE(SPELL_BLOOD_INFUSION_CREDIT, true);
 
                 CleanAuras();
-				
-				if (!killer)
-					return;
-				
+
+                if (!killer)
+                    return;
+
                 // Blah, credit the quest
                 if (_creditBloodQuickening)
                 {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index 70580733a03..c372c16446f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -649,6 +649,14 @@ class npc_high_overlord_saurfang_icc : public CreatureScript
                 return false;
             }
 
+            void GuardBroadcast(std::function<void(Creature*)>&& action) const
+            {
+                std::vector<Creature*> guardList;
+                GetCreatureListWithEntryInGrid(guardList, me, NPC_SE_KOR_KRON_REAVER, 100.0f);
+                for (Creature* guard : guardList)
+                    action(guard);
+            }
+
             void DoAction(int32 action) override
             {
                 switch (action)
@@ -659,10 +667,11 @@ class npc_high_overlord_saurfang_icc : public CreatureScript
                         if (_events.IsInPhase(PHASE_INTRO_A) || _events.IsInPhase(PHASE_INTRO_H))
                             return;
 
-                        GetCreatureListWithEntryInGrid(_guardList, me, NPC_SE_KOR_KRON_REAVER, 20.0f);
-                        _guardList.sort(Trinity::ObjectDistanceOrderPred(me));
+                        std::list<Creature*> guardList;
+                        GetCreatureListWithEntryInGrid(guardList, me, NPC_SE_KOR_KRON_REAVER, 20.0f);
+                        guardList.sort(Trinity::ObjectDistanceOrderPred(me));
                         uint32 x = 1;
-                        for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++x, ++itr)
+                        for (auto itr = guardList.begin(); itr != guardList.end(); ++x, ++itr)
                             (*itr)->AI()->SetData(0, x);
 
                         me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -684,15 +693,19 @@ class npc_high_overlord_saurfang_icc : public CreatureScript
                         _events.ScheduleEvent(EVENT_OUTRO_HORDE_5, 30000);   // move
                         me->SetDisableGravity(false);
                         me->GetMotionMaster()->MoveFall();
-                        for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr)
-                            (*itr)->AI()->DoAction(ACTION_DESPAWN);
+                        GuardBroadcast([](Creature* guard)
+                        {
+                            guard->AI()->DoAction(ACTION_DESPAWN);
+                        });
                         break;
                     }
                     case ACTION_INTERRUPT_INTRO:
                     {
                         _events.Reset();
-                        for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr)
-                            (*itr)->AI()->DoAction(ACTION_DESPAWN);
+                        GuardBroadcast([](Creature* guard)
+                        {
+                            guard->AI()->DoAction(ACTION_DESPAWN);
+                        });
                         break;
                     }
                     default:
@@ -776,8 +789,10 @@ class npc_high_overlord_saurfang_icc : public CreatureScript
                             break;
                         case EVENT_INTRO_HORDE_8:
                             Talk(SAY_INTRO_HORDE_8);
-                            for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr)
-                                (*itr)->AI()->DoAction(ACTION_CHARGE);
+                            GuardBroadcast([](Creature* guard)
+                            {
+                                guard->AI()->DoAction(ACTION_CHARGE);
+                            });
                             me->GetMotionMaster()->MoveCharge(chargePos[0].GetPositionX(), chargePos[0].GetPositionY(), chargePos[0].GetPositionZ(), 8.5f, POINT_CHARGE);
                             break;
                         case EVENT_OUTRO_HORDE_2:   // say
@@ -810,7 +825,6 @@ class npc_high_overlord_saurfang_icc : public CreatureScript
         private:
             EventMap _events;
             InstanceScript* _instance;
-            std::list<Creature*> _guardList;
         };
 
         CreatureAI* GetAI(Creature* creature) const override
@@ -846,6 +860,14 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
                 return false;
             }
 
+            void GuardBroadcast(std::function<void(Creature*)>&& action) const
+            {
+                std::vector<Creature*> guardList;
+                GetCreatureListWithEntryInGrid(guardList, me, NPC_SE_SKYBREAKER_MARINE, 100.0f);
+                for (Creature* guard : guardList)
+                    action(guard);
+            }
+
             void DoAction(int32 action) override
             {
                 switch (action)
@@ -857,10 +879,11 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
                             return;
 
                         _events.SetPhase(PHASE_INTRO_A);
-                        GetCreatureListWithEntryInGrid(_guardList, me, NPC_SE_SKYBREAKER_MARINE, 20.0f);
-                        _guardList.sort(Trinity::ObjectDistanceOrderPred(me));
+                        std::list<Creature*> guardList;
+                        GetCreatureListWithEntryInGrid(guardList, me, NPC_SE_SKYBREAKER_MARINE, 20.0f);
+                        guardList.sort(Trinity::ObjectDistanceOrderPred(me));
                         uint32 x = 1;
-                        for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++x, ++itr)
+                        for (auto itr = guardList.begin(); itr != guardList.end(); ++x, ++itr)
                             (*itr)->AI()->SetData(0, x);
 
                         me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -877,8 +900,10 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
                         Talk(SAY_OUTRO_ALLIANCE_1);
                         me->SetDisableGravity(false);
                         me->GetMotionMaster()->MoveFall();
-                        for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr)
-                            (*itr)->AI()->DoAction(ACTION_DESPAWN);
+                        GuardBroadcast([](Creature* guard)
+                        {
+                            guard->AI()->DoAction(ACTION_DESPAWN);
+                        });
 
                         // temp until outro fully done - to put deathbringer on respawn timer (until next reset)
                         if (Creature* deathbringer = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_DEATHBRINGER_SAURFANG)))
@@ -887,8 +912,10 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
                     }
                     case ACTION_INTERRUPT_INTRO:
                         _events.Reset();
-                        for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr)
-                            (*itr)->AI()->DoAction(ACTION_DESPAWN);
+                        GuardBroadcast([](Creature* guard)
+                        {
+                            guard->AI()->DoAction(ACTION_DESPAWN);
+                        });
                         break;
                 }
             }
@@ -935,8 +962,10 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
                             break;
                         case EVENT_INTRO_ALLIANCE_5:
                             Talk(SAY_INTRO_ALLIANCE_5);
-                            for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr)
-                                (*itr)->AI()->DoAction(ACTION_CHARGE);
+                            GuardBroadcast([](Creature* guard)
+                            {
+                                guard->AI()->DoAction(ACTION_CHARGE);
+                            });
                             me->GetMotionMaster()->MoveCharge(chargePos[0].GetPositionX(), chargePos[0].GetPositionY(), chargePos[0].GetPositionZ(), 8.5f, POINT_CHARGE);
                             break;
                     }
@@ -946,7 +975,6 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
         private:
             EventMap _events;
             InstanceScript* _instance;
-            std::list<Creature*> _guardList;
         };
 
         CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index fab3265b7d1..4a6f5e0fc84 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -67,7 +67,7 @@ class boss_cyanigosa : public CreatureScript
             void JustDied(Unit* /*killer*/) override
             {
                 Talk(SAY_DEATH);
-				_JustDied();
+                    _JustDied();
             }
 
             void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
index 1ac10fe4e1f..64f0e1d3b75 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
@@ -96,7 +96,7 @@ class boss_erekem : public CreatureScript
             void JustDied(Unit* /*killer*/) override
             {
                 Talk(SAY_DEATH);
-				_JustDied();
+                    _JustDied();
             }
 
             bool CheckGuardAuras(Creature* guard) const
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index ed6be37b23a..7053bc0ecaa 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -167,7 +167,7 @@ class boss_ichoron : public CreatureScript
             void JustDied(Unit* /*killer*/) override
             {
                 Talk(SAY_DEATH);
-				_JustDied();
+                    _JustDied();
             }
 
             void JustSummoned(Creature* summon) override
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
index 9802ff1bb44..acd1bd74c2f 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -118,7 +118,7 @@ class boss_xevozz : public CreatureScript
             void JustDied(Unit* /*killer*/) override
             {
                 Talk(SAY_DEATH);
-				_JustDied();
+                    _JustDied();
             }
 
             void SpellHit(Unit* /*who*/, SpellInfo const* spell) override
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
index 066787e9af4..a8551f9e550 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -107,7 +107,7 @@ class boss_zuramat : public CreatureScript
             void JustDied(Unit* /*killer*/) override
             {
                 Talk(SAY_DEATH);
-				_JustDied();
+                    _JustDied();
             }
 
             void KilledUnit(Unit* victim) override
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 33800bb6b2d..c9f73782aa6 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -371,9 +371,9 @@ public:
 
         void JustDied(Unit* killer) override
         {
-			if (!killer || killer->GetTypeId() != TYPEID_PLAYER)
-				return;
-			
+            if (!killer || killer->GetTypeId() != TYPEID_PLAYER)
+                return;
+
             Player* player = killer->ToPlayer();
 
             if (player->GetQuestStatus(QUEST_TAKEN_BY_THE_SCOURGE) == QUEST_STATUS_INCOMPLETE)
@@ -1240,26 +1240,29 @@ public:
                 {
                     DoCastVictim(SPELL_SHADOW_BOLT);
                     shadowBoltTimer = urand(5000, 12000);
-                } else shadowBoltTimer -= diff;
+                }
+                else shadowBoltTimer -= diff;
 
                 if (deflectionTimer <= diff)
                 {
                     DoCastVictim(SPELL_DEFLECTION);
                     deflectionTimer = urand(20000, 25000);
-                } else deflectionTimer -= diff;
+                }
+                else deflectionTimer -= diff;
 
                 if (soulBlastTimer <= diff)
                 {
                     DoCastVictim(SPELL_SOUL_BLAST);
                     soulBlastTimer  = urand(12000, 18000);
-                } else soulBlastTimer -= diff;
+                }
+                else soulBlastTimer -= diff;
             }
 
             DoMeleeAttackIfReady();
-       }
+        }
 
-       void JustDied(Unit* killer) override
-       {
+        void JustDied(Unit* killer) override
+        {
             if (!leryssaGUID || !arlosGUID)
                 return;
 
@@ -1276,8 +1279,8 @@ public:
             leryssa->ClearUnitState(UNIT_STATE_STUNNED);
             leryssa->SetWalk(false);
             leryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f);
-			
-			if (killer && killer->GetTypeId() == TYPEID_PLAYER)
+
+            if (killer && killer->GetTypeId() == TYPEID_PLAYER)
                 killer->ToPlayer()->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0);
         }
     };