diff --git a/sql/updates/world/2016_06_01_00_world_from_335_was_2016_05_28_00_world.sql b/sql/updates/world/2016_06_01_00_world_from_335_was_2016_05_28_00_world.sql
new file mode 100644
index 00000000000..602f7834cd8
--- /dev/null
+++ b/sql/updates/world/2016_06_01_00_world_from_335_was_2016_05_28_00_world.sql
@@ -0,0 +1 @@
+UPDATE `creature_addon` SET `auras`=55701 WHERE `guid`=100071;
diff --git a/sql/updates/world/2016_06_01_01_world_from_335_was_2016_05_28_01_world.sql b/sql/updates/world/2016_06_01_01_world_from_335_was_2016_05_28_01_world.sql
new file mode 100644
index 00000000000..0ce802fd363
--- /dev/null
+++ b/sql/updates/world/2016_06_01_01_world_from_335_was_2016_05_28_01_world.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_ioc_seaforium_blast_credit';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES 
+(66676, 'spell_ioc_seaforium_blast_credit'),
+(66672, 'spell_ioc_seaforium_blast_credit');
diff --git a/sql/updates/world/2016_06_01_02_world_from_335_was_2016_05_28_02_world_335.sql b/sql/updates/world/2016_06_01_02_world_from_335_was_2016_05_28_02_world_335.sql
new file mode 100644
index 00000000000..0f2334e3f4f
--- /dev/null
+++ b/sql/updates/world/2016_06_01_02_world_from_335_was_2016_05_28_02_world_335.sql
@@ -0,0 +1,242 @@
+/*
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE  `entry` IN(19671,19672,19673);
+DELETE FROM `smart_scripts` WHERE `entryorguid`IN(19671,19672,19673,19666) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`IN(1966600,1967200,1967100,1967101,1967102,1967103,1967104,1967105,1967106,1967107,1967108) AND `source_type`=9;
+
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=18311 AND `source_type`=0 AND `id`=5;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=18312 AND `source_type`=0 AND `id`=6;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=18313 AND `source_type`=0 AND `id`=16;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=18315 AND `source_type`=0 AND `id`=5;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=19307 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
+(18311, 0, 5, 0, 54, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 19671, 0, 0, 0, 0, 0, 0, 'Ethereal Crypt Raider - On Just Summoned - Start Attack'),
+(18312, 0, 6, 0, 54, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 19671, 0, 0, 0, 0, 0, 0, 'Ethereal Spellbinder - On Just Summoned - Start Attack'),
+(18313, 0, 16, 0, 54, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 19671, 0, 0, 0, 0, 0, 0, 'Ethereal Sorcerer - On Just Summoned - Start Attack'),
+(18315, 0, 5, 0, 54, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 19671, 0, 0, 0, 0, 0, 0, 'Ethereal Theurgist - On Just Summoned - Start Attack'),
+(19307, 0, 4, 0, 54, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 19671, 0, 0, 0, 0, 0, 0, 'Nexus Terror - On Just Summoned - Start Attack'),
+(19672, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 80,  1967200, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Consortium Laborer - On Just Summoned  - Run Script'),
+(19673, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 80,  1967200, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Consortium Engineer - On Just Summoned  - Run Script'),
+(19672, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 17,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Consortium Laborer - On Just Summoned  - Set Emote State'),
+(19673, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 17,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Consortium Engineer - On Just Summoned  - Set Emote State'),
+(19666, 0, 1, 0, 54, 0, 100, 0, 0, 0, 0, 0, 80, 1966600, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - On Just Summoned  - Run Script'),
+(19666, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 19671, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - On Death - Set Data'),
+(19671, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 80, 1967100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Just Summoned  - Run Script'),
+(19671, 0, 1, 2, 19, 0, 100, 1, 10218, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Quest Accept Ancient Spirit - Store Targetlist'),
+(19671, 0, 2, 0, 61, 0, 100, 0, 10218, 0, 0, 0, 80, 1967101, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Quest Accept Ancient Spirit - Store Targetlist'),
+(19671, 0, 3, 0, 40, 0, 100, 0, 1, 1967101, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP2 (Path 2) - Say Line 4'),
+(19671, 0, 4, 0, 40, 0, 100, 0, 2, 1967101, 0, 0, 80, 1967102, 2, 0, 0, 0, 0,  1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP4 (Path 2) - Run Script 3'),
+(19671, 0, 5, 0, 40, 0, 100, 0, 9, 1967101, 0, 0, 80, 1967103, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP11 (Path 2) - Run Script 4'),
+(19671, 0, 6, 7, 40, 0, 100, 0, 16, 1967101, 0, 0, 1, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP18 (Path 2) - Say Line 8'),
+(19671, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 54, 7000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP18 (Path 2) - Pause WP'),
+(19671, 0, 8, 20, 40, 0, 100, 0, 17, 1967101, 0, 0, 1, 9, 0, 0, 0, 0, 0,  1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP19 (Path 2) - Say Line 9'),
+(19671, 0, 9, 0, 40, 0, 100, 0, 20, 1967101, 0, 0, 80, 1967104, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP22 (Path 2) - Run Script 5'),
+(19671, 0, 10, 0, 40, 0, 100, 0, 31, 1967101, 0, 0, 80, 1967108, 2, 0, 0, 0,  0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP29 (Path 2) - Run Script 9'),
+(19671, 0, 13, 0, 40, 0, 100, 0, 36, 1967101, 0, 0, 80, 1967105, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP34 (Path 2) - Run Script 6'),
+(19671, 0, 14, 0, 40, 0, 100, 0, 43, 1967101, 0, 0, 80, 1967106, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP41 (Path 2) - Run Script 7'),
+(19671, 0, 15, 0, 6, 0, 100, 0, 0, 0, 0, 0, 6, 10218, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Death - Fail Quest'),
+(19671, 0, 16, 0, 38, 0, 100, 0, 1, 1, 0, 0, 80, 1967107, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Data Set - Run Script 8'),
+(19671, 0, 17, 0, 0, 1, 100, 0, 2000, 3000, 3000, 5000, 11, 13901, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - IC (Phase 1) - Cast Arcane Bolt'),
+(19671, 0, 18, 0, 9, 1, 100, 0, 0, 10, 15000, 23000, 11, 22938, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Range (Phase 1) - Cast Arcane Explosion'),
+(19671, 0, 19, 0, 4, 1, 100, 0, 0, 0, 0, 0, 11, 33839, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Agro (Phase 1) - Cast Vir aani Concentration'),
+(19671, 0, 20, 0, 61, 0, 100, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Link - Turn run on'),
+(19671, 0, 22, 0, 40, 0, 100, 0, 5, 1967101, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP5 Turn run on'),
+(19671, 0, 23, 0, 40, 0, 100, 0, 12, 1967101, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On reached WP12 - Turn run off'),
+(19671, 0, 24, 0, 40, 0, 100, 0, 15, 1967101, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On reached WP15 - Turn run off'),
+(19671, 0, 25, 0, 40, 0, 100, 0, 4, 1967101, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reached WP4 - Set NPC Flags'),
+(19671, 0, 26, 0, 25, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - On Reset - Set Phase 1'),
+(1966600, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Say Line 0'),
+(1966600, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Set Unit Flags'),
+(1966600, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 1, 19666, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Start WP'),
+(1966600, 9, 3, 0, 0, 0, 100, 0, 12000, 12000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Say Line 1'),
+(1966600, 9, 4, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 14, 0, 0, 0, 0, 0, 19, 19671, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Say Line 14 on Cryo-Engineer Sha heen'),
+(1966600, 9, 5, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Say Line 2'),
+(1966600, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 19, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Set Unit Flags'),
+(1966600, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Set Hostile'),
+(1966600, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Set Aggressive'),
+(1966600, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 19671, 0, 0, 0, 0, 0, 0, 'Shadow Lord Xiraxis - Script  - Start Attack'),
+(1967200, 9, 0, 0, 0, 0, 100, 0, 500, 500, 0, 0, 11, 12980, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Consortium Laborer - Script  - Cast Simple Teleport'),
+(1967100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Set Phase 2'),
+(1967100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Rempve NPC Flags'),
+(1967100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 33839, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Cast Vir aani Concentration'),
+(1967100, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Say Line 0'),
+(1967100, 9, 4, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 21, 100, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Say Line 1'),
+(1967100, 9, 5, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 53, 0, 1967100, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Start WP'),
+(1967100, 9, 6, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Say Line 1'),
+(1967100, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 234, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Set Emote State'),
+(1967100, 9, 8, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Set Emote State'),
+(1967100, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 81, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Set NPC Flags'),
+(1967100, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 107, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Summon Group 4'),
+(1967100, 9, 11, 0, 0, 0, 100, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Disable Auto Attack'),
+(1967100, 9, 12, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script  - Set Phase 1'),
+(1967101, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 2  - Say Line 3'),
+(1967101, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 495, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 2  - Set Faction'),
+(1967101, 9, 2, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 53, 0, 1967101, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 2 - Start WP'),
+(1967102, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Set Phase 2'),
+(1967102, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Disable Combat Movement'),
+(1967102, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Set Passive'),
+(1967102, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Pause WP'),
+(1967102, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 233, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Set Emotestate'),
+(1967102, 9, 5, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Set Emotestate'),
+(1967102, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Enable Combat Movement'),
+(1967102, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Set Phase 1'),
+(1967102, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Say Line 5'),
+(1967102, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Set Defensive'),
+(1967102, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 3  - Turn Run Off'),
+(1967103, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Set Phase 2'),
+(1967103, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Disable Combat Movemet'),
+(1967103, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Set Passive'),
+(1967103, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0.2617994, 'Cryo-Engineer Sha heen - Script 4  - Set Orientation'),
+(1967103, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Pause WP'),
+(1967103, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 233, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Set Emotestate'),
+(1967103, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Say Line 6'),
+(1967103, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 107, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Summon Group 0'),
+(1967103, 9, 8, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 1, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Say Line 6'),
+(1967103, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Set Emotestate'),
+(1967103, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Set Phase 1'),
+(1967103, 9, 11, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Set Defensive'),
+(1967103, 9, 12, 0, 0, 0, 100, 0, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Enable Combat Movemet'),
+(1967103, 9, 13, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Set Run Off'),
+(1967104, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Set Phase 2'),
+(1967104, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Set Passive'),
+(1967104, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Disable Combat Movement'),
+(1967104, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0.1396263, 'Cryo-Engineer Sha heen - Script 5  - Set Orientation'),
+(1967104, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Pause WP'),
+(1967104, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 233, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Set Emotestate'),
+(1967104, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 107, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 4  - Summon Group 1'),
+(1967104, 9, 7, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Set Emotestate'),
+(1967104, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Enable Combat Movement'),
+(1967104, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Set Phase 1'),
+(1967104, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Set Defensive'),
+(1967104, 9, 11, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Turn run off'),
+(1967105, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Set Phase 2'),
+(1967105, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Set Passive'),
+(1967105, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Disable Combat Movement'),
+(1967105, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 6.091199, 'Cryo-Engineer Sha heen - Script 6  - Set Orientation'),
+(1967105, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 54, 30000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Pause WP'),
+(1967105, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 233, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Set Emotestate'),
+(1967105, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 11, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Say Line 11'),
+(1967105, 9, 7, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Set Emotestate'),
+(1967105, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Set Defensive'),
+(1967105, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Set Phase 1'),
+(1967105, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Enable Combat Movement'),
+(1967105, 9, 11, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 1, 12, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Say Line 12'),
+(1967105, 9, 12, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 1, 13, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 6  - Say Line 13'),
+(1967105, 9, 13, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 5  - Say Line 11'),
+(1967106, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 7  - Pause WP'),
+(1967106, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 107, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 7  - Summon Group 3'),
+(1967106, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 7  - Summon Group 3'),
+(1967107, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 15, 10218, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 8  - Complete Quest'),
+(1967107, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 15, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 8  - Say Line 15'),
+(1967107, 9, 2, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 16, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 8  - Say Line 16'),
+(1967107, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 15000, 0, 0, 0, 0, 0, 9, 19672, 0, 100, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 8  - Despawn'),
+(1967107, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 15000, 0, 0, 0, 0, 0, 9, 19673, 0, 100, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 8  - Despawn'),
+(1967107, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 15000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 8  - Despawn'),
+(1967108, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 10, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 9  - Say Line 10'),
+(1967108, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 107, 5, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 9  - Summon Group 5'),
+(1967108, 9, 2, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 107, 2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 9  - SUmmon Group 2'),
+(1967108, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cryo-Engineer Sha heen - Script 9  - Turn Run On');
+
+
+
+
+
+DELETE FROM `creature_text` WHERE  `entry`=19666 AND `groupid`>0 AND `id`=0;
+
+DELETE FROM `creature_text` WHERE `entry`=19671;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES 
+(19671, 0, 0, '%s checks to make sure his body is intact.', 16, 0, 100, 0, 0, 0, 17228, 0, 'Cryo-Engineer Sha heen'),
+(19671, 1, 0, 'You made it! Well done, $r. Now if you''ll excuse me, I have to get the rest of our crew inside.', 12, 0, 100, 1, 0, 0, 17229, 0, 'Cryo-Engineer Sha heen'),
+(19671, 2, 0, '%s expertly manipulates the control panel.', 16, 0, 100, 0, 0, 0, 17230, 0, 'Cryo-Engineer Sha heen'),
+(19671, 3, 0, 'Let''s not waste any time! Take anything that isn''t nailed down to the floor and teleport directly to Stormspire! Chop chop!', 12, 0, 100, 1, 0, 0, 17231, 0, 'Cryo-Engineer Sha heen'),
+(19671, 4, 0, 'This should''t take very long. Just watch my back as I empty these nether collectors.', 12, 0, 100, 1, 0, 0, 17246, 0, 'Cryo-Engineer Sha heen'),
+(19671, 5, 0, 'Fantastic! Let''s move on, shall we?', 12, 0, 100, 1, 0, 0, 17248, 0, 'Cryo-Engineer Sha heen'),
+(19671, 6, 0, 'Looking at these energy levels, Shaffar was set to make a killing!', 12, 0, 100, 1, 0, 0, 17249, 0, 'Cryo-Engineer Sha heen'),
+(19671, 7, 0, 'That should do it...', 12, 0, 100, 1, 0, 0, 17251, 0, 'Cryo-Engineer Sha heen'),
+(19671, 8, 0, 'Hrm, now where is the next collector?', 12, 0, 100, 1, 0, 0, 17252, 0, 'Cryo-Engineer Sha heen'),
+(19671, 9, 0, 'Ah, there it is. Follow me, fleshling.', 12, 0, 100, 1, 0, 0, 17254, 0, 'Cryo-Engineer Sha heen'),
+(19671, 10, 0, 'What do we have here? I thought you said the area was secure? This is now the third attack? If we make it out of here, I will definitely be deducting this from your reward. Now don''t just stand there, destroy them so I can get to that collector.', 12, 0, 100, 1, 0, 0, 17256, 0, 'Cryo-Engineer Sha heen'),
+(19671, 11, 0, 'We''re close to the exit. I''ll let you rest for about thirty seconds, but then we''re out of here.', 12, 0, 100, 1, 0, 0, 17258, 0, 'Cryo-Engineer Sha heen'),
+(19671, 12, 0, 'Are you ready to go?', 12, 0, 100, 1, 0, 0, 17260, 0, 'Cryo-Engineer Sha heen'),
+(19671, 13, 0, 'Ok break time is OVER. Let''s go!', 12, 0, 100, 1, 0, 0, 17261, 0, 'Cryo-Engineer Sha heen'),
+(19671, 14, 0, 'Oh really? And what might that be?', 12, 0, 100, 1, 0, 0, 17263, 0, 'Cryo-Engineer Sha heen'),
+(19671, 15, 0, 'He was right, you know. I''ll have to take that tag-line for my own… It''s not like he''ll have a use for it anymore!', 12, 0, 100, 1, 0, 0, 17264, 0, 'Cryo-Engineer Sha heen'),
+(19671, 16, 0, 'Thanks and good luck!', 12, 0, 100, 1, 0, 0, 17265, 0, 'Cryo-Engineer Sha heen'),
+(19666, 1, 0, 'Bravo! Bravo! Good show… I couldn''t convince you to work for me, could I? No, I suppose the needless slaughter of my employees might negatively impact your employment application.', 14, 0, 100, 0, 0, 0, 17241, 0, 'Shadow Lord Xiraxis'),
+(19666, 2, 0, 'Your plan was a good one, Sha''heen, and you would have gotten away with it if not for one thing...', 12, 0, 100, 327, 0, 0, 17243, 0, 'Shadow Lord Xiraxis'),
+(19666, 3, 0, 'Never underestimate the other ethereal''s greed!', 12, 0, 100, 1, 0, 0, 17244, 0, 'Shadow Lord Xiraxis');
+
+DELETE FROM `waypoints` WHERE `entry` IN(1967100,1967101,19666);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(19666, 1, -68.40214, -19.7878, -0.9529961, 'Shadow Lord Xiraxis'),
+(19666, 2, -67.83204, -48.33409, -0.9552881, 'Shadow Lord Xiraxis'),
+(19666, 3, -67.78506, -75.71738, -0.9389226, 'Shadow Lord Xiraxis'),
+(1967100, 1, -354.443, -65.6078, -0.9741728, 'Cryo-Engineer Sha heen'),
+(1967101, 1, -366.7985 ,-72.95073 ,-0.1383943, 'Cryo-Engineer Sha heen'),
+(1967101, 2, -370.5689 ,-73.03973 ,0.7014256, 'Cryo-Engineer Sha heen'),
+(1967101, 3, -363.5802 ,-72.44846 ,-0.9587624, 'Cryo-Engineer Sha heen'),
+(1967101, 4, -371.8158 ,-86.79798 ,-0.958762, 'Cryo-Engineer Sha heen'),
+(1967101, 5, -372.8067 ,-115.3902 ,-0.9587386, 'Cryo-Engineer Sha heen'),
+(1967101, 6, -373.5266 ,-149.3968 ,-0.9787918, 'Cryo-Engineer Sha heen'),
+(1967101, 7, -382.3674 ,-163.1939 ,-0.9493812, 'Cryo-Engineer Sha heen'),
+(1967101, 8, -378.7728 ,-164.4431 ,-0.1216383, 'Cryo-Engineer Sha heen'),
+(1967101, 9, -375.3421 ,-164.1911 ,0.7157794, 'Cryo-Engineer Sha heen'),
+(1967101, 10, -377.8079 ,-164.3831 ,0.09416915, 'Cryo-Engineer Sha heen'),
+(1967101, 11, -381.8036 ,-167.0499 ,-0.9587629, 'Cryo-Engineer Sha heen'),
+(1967101, 12, -374.2704 ,-195.67 ,-0.9876157, 'Cryo-Engineer Sha heen'),
+(1967101, 13, -371.0522 ,-221.1154 ,-0.957548, 'Cryo-Engineer Sha heen'),
+(1967101, 14, -357.3525 ,-224.1118 ,-0.9591594, 'Cryo-Engineer Sha heen'),
+(1967101, 15, -327.2074 ,-223.1011 ,-0.958185, 'Cryo-Engineer Sha heen'),
+(1967101, 16, -317.373 ,-220.9346 ,-0.953047, 'Cryo-Engineer Sha heen'),
+(1967101, 17, -302.139 ,-201.6109 ,-0.9018583, 'Cryo-Engineer Sha heen'),
+(1967101, 18, -291.9838 ,-190.2706 ,-0.9321695, 'Cryo-Engineer Sha heen'),
+(1967101, 19, -272.2044 ,-165.1142 ,-1.962067, 'Cryo-Engineer Sha heen'),
+(1967101, 20, -260.8738 ,-158.3423 ,-1.20301, 'Cryo-Engineer Sha heen'),
+(1967101, 21, -260.8686 ,-160.7864 ,-1.202524, 'Cryo-Engineer Sha heen'),
+(1967101, 22, -246.7021 ,-160.2355 ,-0.9534798, 'Cryo-Engineer Sha heen'),
+(1967101, 23, -238.4669 ,-174.3582 ,-0.953746, 'Cryo-Engineer Sha heen'),
+(1967101, 24, -237.8523 ,-188.0232 ,-0.9510807, 'Cryo-Engineer Sha heen'),
+(1967101, 25, -218.7323 ,-207.1752 ,0.04777823, 'Cryo-Engineer Sha heen'),
+(1967101, 26, -207.835, -211.8027, 1.176572, 'Cryo-Engineer Sha heen'),
+(1967101, 27, -195.085, -217.8027, 0.4265722, 'Cryo-Engineer Sha heen'),
+(1967101, 28, -190.835, -219.5527, -0.5734278, 'Cryo-Engineer Sha heen'),
+(1967101, 29, -183.5801 ,-223.2924 ,-0.9551997, 'Cryo-Engineer Sha heen'),
+(1967101, 30, -147.253 ,-222.2017 ,-0.7159179, 'Cryo-Engineer Sha heen'),
+(1967101, 31, -114.5249 ,-221.926 ,0.4013355, 'Cryo-Engineer Sha heen'),
+(1967101, 32, -89.60782 ,-222.852 ,-0.5187308, 'Cryo-Engineer Sha heen'),
+(1967101, 33, -67.58874 ,-223.6537 ,-0.405379, 'Cryo-Engineer Sha heen'),
+(1967101, 34, -56.8648 ,-223.1615 ,0.02639319, 'Cryo-Engineer Sha heen'),
+(1967101, 35, -20.5673 ,-224.0332 ,0.5167194, 'Cryo-Engineer Sha heen'),
+(1967101, 36, -12.58579 ,-222.5067 ,1.786049, 'Cryo-Engineer Sha heen'),
+(1967101, 37, -29.4036 ,-223.2606 ,0.01665334, 'Cryo-Engineer Sha heen'),
+(1967101, 38, -53.08645 ,-219.6514 ,0.2137061, 'Cryo-Engineer Sha heen'),
+(1967101, 39, -64.90977 ,-210.4424 ,-0.292502, 'Cryo-Engineer Sha heen'),
+(1967101, 40, -66.85043 ,-179.138 ,-1.307152, 'Cryo-Engineer Sha heen'),
+(1967101, 41, -67.13032 ,-133.7884 ,-1.034937, 'Cryo-Engineer Sha heen'),
+(1967101, 42, -67.16659 ,-112.9431 ,-0.7426757, 'Cryo-Engineer Sha heen'),
+(1967101, 43, -67.0159 ,-87.2571 ,-1.276771, 'Cryo-Engineer Sha heen');
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId`=19671;
+INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`) VALUES 
+(19671, 0, 0, 18312, -370.7318, -134.3002, -0.9618373, 4.572175, 6, 60000),
+(19671, 0, 0, 18315, -374.4721, -194.6065, -0.9929181, 1.529337, 6, 60000),
+(19671, 0, 0, 18312, -369.9984, -194.276, -0.9705924, 1.623082, 6, 60000),
+(19671, 0, 0, 18315, -375.2323, -133.8772, -0.968161, 4.922849, 6, 60000),
+(19671, 0, 1, 18311, -238.7594, -186.9294, -0.9510754, 1.999699, 6, 60000),
+(19671, 0, 1, 18313, -225.0942, -172.4903, -1.055191, 2.76561, 6, 60000),
+(19671, 0, 1, 18313, -288.748, -178.6396, -0.5875124, 0.6407801, 6, 60000),
+(19671, 0, 1, 18313, -283.9628, -188.2815, -0.3590364, 0.9258388, 6, 60000),
+(19671, 0, 2, 19307, -13.30131, -220.9802, 0.8455964, 3.126897, 6, 60000),
+(19671, 0, 3, 19666, -36.36667, 1.317166, -0.9543327, 3.285605, 6, 60000),
+(19671, 0, 4, 19673, -386.8928, -60.84314, -0.8754397, 3.368485, 6, 60000),
+(19671, 0, 4, 19672, -386.847, -72.83556, -0.8754347, 2.635447, 6, 60000),
+(19671, 0, 4, 19673, -375.7296, -88.8795, -0.8754307, 3.385939, 6, 60000),
+(19671, 0, 4, 19672, -360.1015, -67.55888, -0.8754327, 0.2094395, 6, 60000),
+(19671, 0, 4, 19673, -358.8426, -74.0751, -0.8726627, 0.6806784, 6, 60000),
+(19671, 0, 4, 19672, -370.8748, -82.77579, -0.8754287, 0.08726646, 6, 60000),
+(19671, 0, 4, 19673, -374.6943, -63.50459, -0.8754317, 0.5759587, 6, 60000),
+(19671, 0, 4, 19672, -358.8426, -74.0751, -0.8726627, 0.6806784, 6, 60000),
+(19671, 0, 4, 19673, -375.8055, -86.87415, -0.9587618, 1.608575, 6, 60000),
+(19671, 0, 4, 19673, -386.8928, -60.84314, -0.8754397, 3.368485, 6, 60000),
+(19671, 0, 5, 19307, -47.63387, -223.8948, -0.1993168, 3.440399, 6, 60000);
+*/
diff --git a/sql/updates/world/2016_06_01_03_world_from_335_was_2016_05_28_03_world.sql b/sql/updates/world/2016_06_01_03_world_from_335_was_2016_05_28_03_world.sql
new file mode 100644
index 00000000000..69ee8803260
--- /dev/null
+++ b/sql/updates/world/2016_06_01_03_world_from_335_was_2016_05_28_03_world.sql
@@ -0,0 +1,25 @@
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=22139;
+UPDATE `smart_scripts` SET `target_param1`=22139, `target_param2`=100, `action_param2`=64 WHERE `entryorguid`=22138 AND `source_type`=0 AND `id`=0;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=38469 AND `ElseGroup`=0;
+DELETE FROM `gameobject` WHERE `id`=184750;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (22137);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (22137) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (22138) 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
+(22137, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 75, 38457, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Summoned Old God - On reset - Add Transparency'),
+(22137, 0, 1, 0, 1, 8, 100, 0, 0, 0, 240000, 240000, 50, 184750, 240, 0, 0, 0, 0, 8, 0, 0, 0, -4161.259277, 1985.773804, 59.094448, 6.210211,'Summoned Old God - OOC (Phase 4) - spawn spell focus'),
+(22137, 0, 2, 0, 38, 0, 100, 0, 1, 1, 0, 0, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Summoned Old God - On Data Set 1 1 - Increment Phase'),
+(22137, 0, 3, 0, 38, 0, 100, 0, 2, 2, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Summoned Old God - On Data Set 2 2 - Set Phase 0'),
+(22137, 0, 4, 0, 11, 0, 100, 0, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Summoned Old God - On Spawn Set Active'),
+(22137, 0, 5, 6, 8, 0, 100, 0, 38482, 0, 0, 0, 33, 22137, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0,'Summoned Old God - On Spellhit - Give Kill Credit'),
+(22137, 0, 6, 7, 61, 0, 0, 0, 0, 0, 0, 0, 11, 37281, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Summoned Old God - On Spellhit - Cast Infernal Oversouls Wrath'),
+(22137, 0, 7, 8, 61, 0, 0, 0, 0, 0, 0, 0, 41, 1000, 0, 0, 0, 0, 0, 19, 22146, 0, 0, 0, 0, 0, 0,'Summoned Old God - On Spellhit - Despawn Summoning Voidstorm'),
+(22138, 0, 1, 0, 6, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 22137, 100, 0, 0, 0, 0,0,'Dark Conclave Ritualist - On Death - Set Data'),
+(22138, 0, 2, 0, 11, 0, 100, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 22137, 100, 0, 0, 0, 0,0,'Dark Conclave Ritualist - On Respawn - Set Data');
+
+DELETE FROM `conditions` WHERE  `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=37281 AND `SourceId`=0 AND `ElseGroup`IN(2,3);
+
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(13, 1, 37281, 0, 2, 31, 0, 3, 22137, 0, 0, 0, 0, '', 'Infernal Oversouls Wrath targets Summoned Old God'),
+(13, 1, 37281, 0, 3, 31, 0, 3, 22146, 0, 0, 0, 0, '', 'Infernal Oversouls Wrath targets Summoning Voidstorm');
diff --git a/sql/updates/world/2016_06_01_04_world_from_335_was_2016_05_30_00_world.sql b/sql/updates/world/2016_06_01_04_world_from_335_was_2016_05_30_00_world.sql
new file mode 100644
index 00000000000..b6fdc5f3b89
--- /dev/null
+++ b/sql/updates/world/2016_06_01_04_world_from_335_was_2016_05_30_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `quest_template_addon` SET `ExclusiveGroup` = 11211 WHERE `ID` IN (11211,11214,11215);
diff --git a/sql/updates/world/2016_06_01_05_world_from_335_was_2016_05_30_01_world.sql b/sql/updates/world/2016_06_01_05_world_from_335_was_2016_05_30_01_world.sql
new file mode 100644
index 00000000000..a18ffe23ed5
--- /dev/null
+++ b/sql/updates/world/2016_06_01_05_world_from_335_was_2016_05_30_01_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=11261;
diff --git a/sql/updates/world/2016_06_01_06_world_from_335_was_2016_05_30_02_world.sql b/sql/updates/world/2016_06_01_06_world_from_335_was_2016_05_30_02_world.sql
new file mode 100644
index 00000000000..2742f9c8ca9
--- /dev/null
+++ b/sql/updates/world/2016_06_01_06_world_from_335_was_2016_05_30_02_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `quest_template_addon` WHERE `MaxLevel` = 0 AND `AllowableClasses` = 0 AND `SourceSpellID` = 0 AND `PrevQuestID` = 0 AND `NextQuestID` = 0 AND `ExclusiveGroup` = 0 AND `RewardMailTemplateID` = 0 AND `RewardMailDelay` = 0 AND `RequiredSkillID` = 0 AND `RequiredSkillPoints` = 0 AND `RequiredMinRepFaction` = 0 AND `RequiredMaxRepFaction` = 0 AND `RequiredMinRepValue` = 0 AND `RequiredMaxRepValue` = 0 AND `ProvidedItemCount` = 0 AND `SpecialFlags` = 0;
diff --git a/sql/updates/world/2016_06_01_07_world_from_335_was_2016_05_30_03_world.sql b/sql/updates/world/2016_06_01_07_world_from_335_was_2016_05_30_03_world.sql
new file mode 100644
index 00000000000..eeaa7bf6d7b
--- /dev/null
+++ b/sql/updates/world/2016_06_01_07_world_from_335_was_2016_05_30_03_world.sql
@@ -0,0 +1,7 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=50232;
+INSERT INTO `conditions` VALUES
+(13, 1, 50232, 0, 1, 31, 0, 3, 28236, 0, 0, 0, 0, "", "Searing Wrath target can be Azure Ring Captain"),
+(13, 1, 50232, 0, 2, 31, 0, 3, 27638, 0, 0, 0, 0, "", "Searing Wrath target can be Azure Ring Guardian"),
+(13, 1, 50232, 0, 3, 31, 0, 3, 28276, 0, 0, 0, 0, "", "Searing Wrath target can be Greater Lay Whelp"),
+(13, 1, 50232, 0, 4, 31, 0, 3, 27656, 0, 0, 0, 0, "", "Searing Wrath target can be Eregos");
diff --git a/sql/updates/world/2016_06_01_08_world_from_335_was_2016_05_30_04_world.sql b/sql/updates/world/2016_06_01_08_world_from_335_was_2016_05_30_04_world.sql
new file mode 100644
index 00000000000..0fc9244c100
--- /dev/null
+++ b/sql/updates/world/2016_06_01_08_world_from_335_was_2016_05_30_04_world.sql
@@ -0,0 +1,2 @@
+-- Change the Text <Name> to $N
+UPDATE `quest_request_items` SET `CompletionText`= "Back so soon? In case I didn\'t make myself clear we need you to kill 10 Stonesplinter Shaman and 10 Stonesplinter Bonesnappers, $N. Now go get\'em, Trogg-Slayer!" WHERE `id` = 263;
diff --git a/sql/updates/world/2016_06_01_09_world_from_335_was_2016_05_30_05_world.sql b/sql/updates/world/2016_06_01_09_world_from_335_was_2016_05_30_05_world.sql
new file mode 100644
index 00000000000..7209b3d8745
--- /dev/null
+++ b/sql/updates/world/2016_06_01_09_world_from_335_was_2016_05_30_05_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `quest_template_addon` SET `SpecialFlags` = 1 WHERE `Id` = 13845;
+DELETE FROM `conditions` WHERE `SourceEntry` = 46004 AND `SourceTypeOrReferenceId` = 10;
diff --git a/sql/updates/world/2016_06_01_10_world_from_335_was_2016_05_30_06_world.sql b/sql/updates/world/2016_06_01_10_world_from_335_was_2016_05_30_06_world.sql
new file mode 100644
index 00000000000..5c81fcd5419
--- /dev/null
+++ b/sql/updates/world/2016_06_01_10_world_from_335_was_2016_05_30_06_world.sql
@@ -0,0 +1,12 @@
+--
+DELETE FROM `gameobject_queststarter` WHERE `quest` IN (4722,4723,4725,4727,4728,4730,4731,4732,4733);
+INSERT INTO `gameobject_queststarter` VALUES
+(176190, 4722),
+(175233, 4723),
+(176197, 4725),
+(176196, 4727),
+(175226, 4728),
+(175227, 4730),
+(176198, 4731),
+(176191, 4732),
+(175230, 4733);
diff --git a/sql/updates/world/2016_06_01_11_world_from_335_was_2016_05_30_07_world.sql b/sql/updates/world/2016_06_01_11_world_from_335_was_2016_05_30_07_world.sql
new file mode 100644
index 00000000000..c8130b023af
--- /dev/null
+++ b/sql/updates/world/2016_06_01_11_world_from_335_was_2016_05_30_07_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `achievement_criteria_data` SET `value1`=8 WHERE `criteria_id`=4958 AND `type`=8;
diff --git a/sql/updates/world/2016_06_01_12_world_from_335_was_2016_05_30_08_world.sql b/sql/updates/world/2016_06_01_12_world_from_335_was_2016_05_30_08_world.sql
new file mode 100644
index 00000000000..134617b0380
--- /dev/null
+++ b/sql/updates/world/2016_06_01_12_world_from_335_was_2016_05_30_08_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17071 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
+(17071,0,0,0,20,0,100,0,9312,0,0,0,80,1707100,2,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Quest 'The Emitter' Finished - Run Script");
diff --git a/sql/updates/world/2016_06_01_13_world_from_335_was_2016_05_30_09_world.sql b/sql/updates/world/2016_06_01_13_world_from_335_was_2016_05_30_09_world.sql
new file mode 100644
index 00000000000..3ec588d0982
--- /dev/null
+++ b/sql/updates/world/2016_06_01_13_world_from_335_was_2016_05_30_09_world.sql
@@ -0,0 +1,5 @@
+UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE  `ID`=1144;
+UPDATE `creature_template` SET `flags_extra`=64 WHERE  `entry` IN(28111,28112,28078,28079,23667, 23668, 32669,28844,28843,24199,24198,23564);
+UPDATE `reference_loot_template` SET `GroupId`=2 WHERE  `Entry`=34203 AND `Item`=43959;
+UPDATE `smart_scripts` SET `target_type`=12, `target_param1`=1 WHERE  `entryorguid`=2735500 AND `source_type`=9 AND `id`=5 AND `link`=0;
+UPDATE `gameobject` SET `position_x`=5445.057129, `position_y`=4908.831543, `position_z`=-189.508224 WHERE  `guid`=99748;
diff --git a/sql/updates/world/2016_06_01_14_world_from_335_was_2016_05_30_10_world.sql b/sql/updates/world/2016_06_01_14_world_from_335_was_2016_05_30_10_world.sql
new file mode 100644
index 00000000000..b8dbe0b94a6
--- /dev/null
+++ b/sql/updates/world/2016_06_01_14_world_from_335_was_2016_05_30_10_world.sql
@@ -0,0 +1,26 @@
+DELETE FROM `gameobject_loot_template` WHERE `Entry`=26782;
+INSERT INTO `gameobject_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(26782, 44724, 0, 100, 0, 1, 1, 1, 1, NULL), -- Everfrost Chip
+(26782, 44725, 0, 19, 0, 1, 2, 1, 1, NULL), -- Everfrost Chip (Quest Starter)
+(26782, 44729, 0, 81, 0, 1, 2, 1, 1, NULL); -- Everfrost Powder
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=4 AND `SourceGroup`=26782;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(4, 26782, 44724, 0, 1, 8, 0, 13420, 0, 0, 0, 0, 0, '', NULL), -- Everfrost Chip  only drops if player is rewarded for ever frost,
+(4, 26782, 44729, 0, 0, 9, 0, 13420, 0, 0, 1, 0, 0, '', NULL), -- Everfrost powder only drops if player has not taken or completed Everfrost,
+(4, 26782, 44729, 0, 0, 8, 0, 13420, 0, 0, 1, 0, 0, '', NULL), -- Everfrost powder only drops if player has not taken or completed Everfrost,
+(4, 26782, 44725, 0, 0, 9, 0, 13420, 0, 0, 1, 0, 0, '', NULL), -- Everfrost Chip (Quest Starter) only drops if player has not taken or completed Everfrost,
+(4, 26782, 44725, 0, 0, 8, 0, 13420, 0, 0, 1, 0, 0, '', NULL), -- Everfrost Chip (Quest Starter) only drops if player has not taken or completed Everfrost,
+(4, 26782, 44725, 0, 0, 5, 0, 1119, 8, 0, 0, 0, 0, '', NULL); -- Everfrost Chip (Quest Starter) only drops if player is friendly with Sons of Hodir,
+
+UPDATE `quest_template_addon` SET `SpecialFlags`=1 WHERE  `ID`=13421;
+
+DELETE FROM `creature_questender` WHERE `quest`=13421;
+INSERT INTO `creature_questender` (`id`, `quest`) VALUES
+(32594, 13421);
+
+DELETE FROM `creature_queststarter` WHERE `quest`=13421;
+INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES
+(32594, 13421);
+
+UPDATE `quest_template_addon` SET `PrevQuestID`=13420 WHERE  `ID`=13421;
diff --git a/sql/updates/world/2016_06_01_15_world_from_335_was_2016_05_31_00_world.sql b/sql/updates/world/2016_06_01_15_world_from_335_was_2016_05_31_00_world.sql
new file mode 100644
index 00000000000..29a29413167
--- /dev/null
+++ b/sql/updates/world/2016_06_01_15_world_from_335_was_2016_05_31_00_world.sql
@@ -0,0 +1,6 @@
+-- 
+UPDATE `creature` SET `position_x`= -3739.09, `position_y`= 5405.21, `position_z`=-3.33350, `orientation`=2.70103, `MovementType`=0, `spawndist`=0 WHERE `guid`=78837 AND `id`=22464;
+UPDATE `creature` SET `position_x`= -3743.46, `position_y`= 5403.87, `position_z`=-3.33635, `orientation`=1.16950, `MovementType`=0, `spawndist`=0 WHERE `guid`=78838 AND `id`=22464;
+UPDATE `creature` SET `position_x`= -3746.42, `position_y`= 5405.33, `position_z`=-3.33737, `orientation`=0.39587, `MovementType`=0, `spawndist`=0 WHERE `guid`=78839 AND `id`=22464;
+UPDATE `creature` SET `position_x`= -3750.65, `position_y`= 5408.94, `position_z`=-3.33391, `orientation`=2.54786, `MovementType`=0, `spawndist`=0 WHERE `guid`=78840 AND `id`=22464;
+UPDATE `creature` SET `position_x`= -3741.11, `position_y`= 5403.61, `position_z`=-3.33493, `orientation`=1.9117 WHERE `guid`=78818 AND `id`=22458;
diff --git a/sql/updates/world/2016_06_01_16_world_from_335_was_2016_05_31_01_world_335.sql b/sql/updates/world/2016_06_01_16_world_from_335_was_2016_05_31_01_world_335.sql
new file mode 100644
index 00000000000..165ee10d467
--- /dev/null
+++ b/sql/updates/world/2016_06_01_16_world_from_335_was_2016_05_31_01_world_335.sql
@@ -0,0 +1,11 @@
+/*
+-- 
+DELETE FROM `conditions` WHERE `SourceEntry` IN (6545, 6546, 6547) AND `SourceTypeOrReferenceId` IN (19, 20);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19, 0, 6545, 0, 0, 9, 0, 6543, 0, 0, 0, 0, 0, "", "Quest 'Warsong Runner Update' - Can accept if player has quest 'The Warsong Reports' in quest log"),
+(20, 0, 6545, 0, 0, 9, 0, 6543, 0, 0, 0, 0, 0, "", "Quest 'Warsong Runner Update' - Can accept if player has quest 'The Warsong Reports' in quest log"),
+(19, 0, 6546, 0, 0, 9, 0, 6543, 0, 0, 0, 0, 0, "", "Quest 'Warsong Outrider Update' - Can accept if player has quest 'The Warsong Reports' in quest log"),
+(20, 0, 6546, 0, 0, 9, 0, 6543, 0, 0, 0, 0, 0, "", "Quest 'Warsong Outrider Update' - Can accept if player has quest 'The Warsong Reports' in quest log"),
+(19, 0, 6547, 0, 0, 9, 0, 6543, 0, 0, 0, 0, 0, "", "Quest 'Warsong Scout Update' - Can accept if player has quest 'The Warsong Reports' in quest log"),
+(20, 0, 6547, 0, 0, 9, 0, 6543, 0, 0, 0, 0, 0, "", "Quest 'Warsong Scout Update' - Can accept if player has quest 'The Warsong Reports' in quest log");
+*/
diff --git a/sql/updates/world/2016_06_01_17_world_from_335_was_2016_05_31_02_world.sql b/sql/updates/world/2016_06_01_17_world_from_335_was_2016_05_31_02_world.sql
new file mode 100644
index 00000000000..09674385ab4
--- /dev/null
+++ b/sql/updates/world/2016_06_01_17_world_from_335_was_2016_05_31_02_world.sql
@@ -0,0 +1,19 @@
+-- 
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0, `unit_flags`=537133824 WHERE `guid` IN (103024, 103025, 103026, 103027, 103028);
+
+DELETE FROM `creature_addon` WHERE `guid` IN (103024, 103025, 103026, 103027, 103028);
+INSERT INTO `creature_addon` (`guid`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(103024, 0, 0x0, 0x1, '29266'), -- 25680 - 29266 - 29266
+(103025, 0, 0x0, 0x1, '29266'), -- 25680 - 29266 - 29266
+(103026, 0, 0x0, 0x1, '29266'), -- 25680 - 29266 - 29266
+(103027, 0, 0x0, 0x1, '29266'), -- 25680 - 29266 - 29266
+(103028, 0, 0x0, 0x1, '29266'); -- 25680 - 29266 - 29266
+
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `id`=29546;
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (24196, 29546);
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(24196, 0, 0x0, 0x1, '29266'), -- 24196 - 29266
+(29546, 0, 0x0, 0x1, '29266'); -- 29546 - 29266
+
+DELETE FROM `creature_addon` WHERE `guid`=105491;
diff --git a/sql/updates/world/2016_06_01_18_world_from_335_was_2016_05_31_03_world.sql b/sql/updates/world/2016_06_01_18_world_from_335_was_2016_05_31_03_world.sql
new file mode 100644
index 00000000000..60c07d15735
--- /dev/null
+++ b/sql/updates/world/2016_06_01_18_world_from_335_was_2016_05_31_03_world.sql
@@ -0,0 +1,3 @@
+-- 
+UPDATE `conditions` SET `ConditionValue1`=11248, `Comment`='Winterskorn mobs drop item 33314 only if Quest 11248 has been rewarded' WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry`=33314;
+UPDATE `conditions` SET `ConditionValue1`=11256, `Comment`='Winterskorn mobs drop item 33345 only if Quest 11256 has been rewarded' WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry`=33345;
diff --git a/sql/updates/world/2016_06_01_19_world_from_335_was_2016_05_31_04_world.sql b/sql/updates/world/2016_06_01_19_world_from_335_was_2016_05_31_04_world.sql
new file mode 100644
index 00000000000..d3ddfcfa05c
--- /dev/null
+++ b/sql/updates/world/2016_06_01_19_world_from_335_was_2016_05_31_04_world.sql
@@ -0,0 +1,15 @@
+-- 
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5187, 5190);
+INSERT INTO `areatrigger_scripts` VALUES
+(5187, "SmartTrigger"),
+(5190, "SmartTrigger");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (5187, 5190) AND `source_type`=2;
+INSERT INTO `smart_scripts` VALUES
+(5187, 2, 0, 0, 46, 0, 100, 0, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 6150.7563, -1071.3817, 402.7154, 2.1916, "Areatrigger - On Trigger - Teleport"),
+(5190, 2, 0, 0, 46, 0, 100, 0, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 6314.1860, -1758.2946, 457.0714, 1.6787, "Areatrigger - On Trigger - Teleport");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceId`=2 AND SourceEntry IN (5187, 5190);
+INSERT INTO `conditions` VALUES
+(22, 1, 5187, 2, 0, 8, 0, 12821, 0, 0, 0, 0, 0, "", "Event requires quest rewarded"),
+(22, 1, 5190, 2, 0, 8, 0, 12821, 0, 0, 0, 0, 0, "", "Event requires quest rewarded");
diff --git a/sql/updates/world/2016_06_01_20_world_from_335_was_2016_05_31_05_world.sql b/sql/updates/world/2016_06_01_20_world_from_335_was_2016_05_31_05_world.sql
new file mode 100644
index 00000000000..18bbf61baa4
--- /dev/null
+++ b/sql/updates/world/2016_06_01_20_world_from_335_was_2016_05_31_05_world.sql
@@ -0,0 +1,12 @@
+-- 
+UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `Id`=12836;
+
+DELETE FROM `conditions` WHERE `SourceEntry`=12828 AND `SourceTypeOrReferenceId` IN (19, 20);
+INSERT INTO `conditions` VALUES
+(19, 0, 12828, 0, 0, 8, 0, 12827, 0, 0, 0, 0, 0, "", "Show mark for quest 'Ample Inspiration' only if quest 'Reclaimed Rations' is rewarded"),
+(20, 0, 12828, 0, 0, 8, 0, 12827, 0, 0, 0, 0, 0, "", "Can accept quest 'Ample Inspiration' only if quest 'Reclaimed Rations' is rewarded");
+
+DELETE FROM `quest_template_addon` WHERE `ID` IN (12862, 13060);
+INSERT INTO `quest_template_addon` (`ID`, `PrevQuestId`) VALUES
+(12862, 12824),
+(13060, 12824);
diff --git a/sql/updates/world/2016_06_01_21_world_from_335_was_2016_05_31_06_world.sql b/sql/updates/world/2016_06_01_21_world_from_335_was_2016_05_31_06_world.sql
new file mode 100644
index 00000000000..46d8b875c82
--- /dev/null
+++ b/sql/updates/world/2016_06_01_21_world_from_335_was_2016_05_31_06_world.sql
@@ -0,0 +1,10 @@
+-- 
+-- remove mis-spawned Mistbat (entry: 16353)
+DELETE FROM `creature` WHERE `guid`=57016;
+
+-- remove one too many spawned Elder Springpaw (entry: 15651)
+DELETE FROM `creature` WHERE `guid`=55946;
+
+-- set random movement and spawn distance to the common value for that creature
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid`=55942;
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid`=55945;
diff --git a/sql/updates/world/2016_06_01_22_world_from_335_was_2016_05_31_07_world.sql b/sql/updates/world/2016_06_01_22_world_from_335_was_2016_05_31_07_world.sql
new file mode 100644
index 00000000000..7ed017ff1cd
--- /dev/null
+++ b/sql/updates/world/2016_06_01_22_world_from_335_was_2016_05_31_07_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature_loot_template` SET `MinCount`=1, `MaxCount`=1 WHERE `Item`=11509;
diff --git a/sql/updates/world/2016_06_01_23_world_from_335_was_2016_05_31_08_world.sql b/sql/updates/world/2016_06_01_23_world_from_335_was_2016_05_31_08_world.sql
new file mode 100644
index 00000000000..2cf3fbcdfc4
--- /dev/null
+++ b/sql/updates/world/2016_06_01_23_world_from_335_was_2016_05_31_08_world.sql
@@ -0,0 +1,13 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceEntry`=23359 AND `SourceTypeOrReferenceId`=17;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`, `ErrorType`, `ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(17, 0, 23359, 0, 0, 31, 1, 3, 5357, 0, 0, 0, 0, "", "Transmogrify! target can be Land Walker"),
+(17, 0, 23359, 0, 0, 36, 1, 0, 0, 0, 0, 0, 0, "", "Transmogrify! target must be alive"),
+(17, 0, 23359, 0, 1, 31, 1, 3, 5358, 0, 0, 0, 0, "", "Transmogrify! target can be Cliff Giant"),
+(17, 0, 23359, 0, 1, 36, 1, 0, 0, 0, 0, 0, 0, "", "Transmogrify! target must be alive"),
+(17, 0, 23359, 0, 2, 31, 1, 3, 5359, 0, 0, 0, 0, "", "Transmogrify! target can be Shore Strider"),
+(17, 0, 23359, 0, 2, 36, 1, 0, 0, 0, 0, 0, 0, "", "Transmogrify! target must be alive"),
+(17, 0, 23359, 0, 3, 31, 1, 3, 5360, 0, 0, 0, 0, "", "Transmogrify! target can be Deep Strider"),
+(17, 0, 23359, 0, 3, 36, 1, 0, 0, 0, 0, 0, 0, "", "Transmogrify! target must be alive"),
+(17, 0, 23359, 0, 4, 31, 1, 3, 5361, 0, 0, 0, 0, "", "Transmogrify! target can be Wave Strider"),
+(17, 0, 23359, 0, 4, 36, 1, 0, 0, 0, 0, 0, 0, "", "Transmogrify! target must be alive");
diff --git a/sql/updates/world/2016_06_01_24_world_from_335_was_2016_05_31_09_world.sql b/sql/updates/world/2016_06_01_24_world_from_335_was_2016_05_31_09_world.sql
new file mode 100644
index 00000000000..73d62a92772
--- /dev/null
+++ b/sql/updates/world/2016_06_01_24_world_from_335_was_2016_05_31_09_world.sql
@@ -0,0 +1,3 @@
+-- 
+UPDATE `creature_template` SET `speed_run`=0.42857 WHERE `entry` IN (16027);
+UPDATE `smart_scripts` SET `action_param1`=22 WHERE  `entryorguid`=16027 AND `source_type`=0 AND `id`=3 AND `link`=4;
diff --git a/sql/updates/world/2016_06_01_25_world_from_335_was_2016_05_31_10_world.sql b/sql/updates/world/2016_06_01_25_world_from_335_was_2016_05_31_10_world.sql
new file mode 100644
index 00000000000..e7536b3a51a
--- /dev/null
+++ b/sql/updates/world/2016_06_01_25_world_from_335_was_2016_05_31_10_world.sql
@@ -0,0 +1,2 @@
+-- 
+DELETE FROM `creature_loot_template` WHERE `Item`=31245;
diff --git a/sql/updates/world/2016_06_01_26_world_from_335_was_2016_05_31_11_world.sql b/sql/updates/world/2016_06_01_26_world_from_335_was_2016_05_31_11_world.sql
new file mode 100644
index 00000000000..e5d35f5eb42
--- /dev/null
+++ b/sql/updates/world/2016_06_01_26_world_from_335_was_2016_05_31_11_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `reference_loot_template` SET `Item`=49667, `Chance`=10 WHERE `Item`=48679;
diff --git a/sql/updates/world/2016_06_01_27_world_from_335_was_2016_05_31_12_world_335.sql b/sql/updates/world/2016_06_01_27_world_from_335_was_2016_05_31_12_world_335.sql
new file mode 100644
index 00000000000..69cfb3e4706
--- /dev/null
+++ b/sql/updates/world/2016_06_01_27_world_from_335_was_2016_05_31_12_world_335.sql
@@ -0,0 +1,4 @@
+/*
+-- 
+UPDATE `quest_template_addon` SET `PrevQuestID`=155 WHERE `ID`=214;
+*/
diff --git a/sql/updates/world/2016_06_01_28_world_from_335_was_2016_05_31_13_world.sql b/sql/updates/world/2016_06_01_28_world_from_335_was_2016_05_31_13_world.sql
new file mode 100644
index 00000000000..6dd3d984c1c
--- /dev/null
+++ b/sql/updates/world/2016_06_01_28_world_from_335_was_2016_05_31_13_world.sql
@@ -0,0 +1,23 @@
+-- 
+UPDATE `quest_template_addon` SET `ExclusiveGroup`=8747 WHERE `Id` IN (8747, 8752, 8757);
+
+UPDATE `quest_template_addon` SET `PrevQuestId`=0, `SpecialFlags`=1 WHERE `Id` IN (8764, 8765, 8766);
+
+DELETE FROM `conditions` WHERE `SourceEntry` IN (8764, 8765, 8766);
+INSERT INTO `conditions` VALUES
+(19, 0, 8764, 0, 0, 2, 0, 21200, 1, 1, 0, 0, 0, "", "Quest 8764 is available only if player has item 21200 in bags or bank"),
+(20, 0, 8764, 0, 0, 2, 0, 21200, 1, 1, 0, 0, 0, "", "Show question mark for quest 8764 only if player has item 21200 in bags or bank"),
+
+(19, 0, 8765, 0, 0, 2, 0, 21210, 1, 1, 0, 0, 0, "", "Quest 8765 is available only if player has item 21210 in bags or bank"),
+(20, 0, 8765, 0, 0, 2, 0, 21210, 1, 1, 0, 0, 0, "", "Show question mark for quest 8765 only if player has item 21210 in bags or bank"),
+
+(19, 0, 8766, 0, 0, 2, 0, 21205, 1, 1, 0, 0, 0, "", "Quest 8766 is available only if player has item 21205 in bags or bank"),
+(20, 0, 8766, 0, 0, 2, 0, 21205, 1, 1, 0, 0, 0, "", "Show question mark for quest 8766 only if player has item 21205 in bags or bank");
+
+DELETE FROM `quest_offer_reward` WHERE `ID` IN (8747, 8752, 8757);
+INSERT INTO `quest_offer_reward` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`RewardText`,`VerifiedBuild`) VALUES
+(8747,1,0,0,0,0,0,0,0,(SELECT `CompletionText` FROM `quest_request_items` WHERE `ID`=8747),12340),
+(8752,1,0,0,0,0,0,0,0,(SELECT `CompletionText` FROM `quest_request_items` WHERE `ID`=8752),12340),
+(8757,1,0,0,0,0,0,0,0,(SELECT `CompletionText` FROM `quest_request_items` WHERE `ID`=8757),12340);
+
+UPDATE `quest_request_items` SET `CompletionText` = "Never have I seen such tenacity! The Bronze Flight grants you one final enchantment. The Timeless One himself has requested it so!$B$BHand me your signet ring so that I may make the necessary adjustments." WHERE `ID` IN (8751, 8756, 8761);
diff --git a/sql/updates/world/2016_06_01_29_world_from_335_was_2016_05_31_14_world_335.sql b/sql/updates/world/2016_06_01_29_world_from_335_was_2016_05_31_14_world_335.sql
new file mode 100644
index 00000000000..4e92505bd4e
--- /dev/null
+++ b/sql/updates/world/2016_06_01_29_world_from_335_was_2016_05_31_14_world_335.sql
@@ -0,0 +1,4 @@
+/*
+-- 
+UPDATE `creature_template` SET `unit_flags`=33536 WHERE `entry`=24117;
+*/
diff --git a/sql/updates/world/2016_06_01_30_world_from_335_was_2016_06_01_00_world.sql b/sql/updates/world/2016_06_01_30_world_from_335_was_2016_06_01_00_world.sql
new file mode 100644
index 00000000000..5f4e7dbb01c
--- /dev/null
+++ b/sql/updates/world/2016_06_01_30_world_from_335_was_2016_06_01_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `quest_template` SET `AllowableRaces`=1024 WHERE `ID`=9429;
diff --git a/sql/updates/world/2016_06_01_31_world_from_335_was_2016_06_01_01_world.sql b/sql/updates/world/2016_06_01_31_world_from_335_was_2016_06_01_01_world.sql
new file mode 100644
index 00000000000..80ecabe34aa
--- /dev/null
+++ b/sql/updates/world/2016_06_01_31_world_from_335_was_2016_06_01_01_world.sql
@@ -0,0 +1,5 @@
+-- 
+UPDATE `creature` SET `position_x`=3154.581, `position_y`=-3126.18,  `position_z`=293.5911, `orientation`=4.430199 WHERE `guid`=76311;
+UPDATE `creature` SET `position_x`=3128.622, `position_y`=-3119.604, `position_z`=293.4113, `orientation`=4.738929 WHERE `guid`=76312;
+UPDATE `creature` SET `position_x`=3175.281, `position_y`=-3134.764, `position_z`=293.4368, `orientation`=4.244924 WHERE `guid`=76313;
+UPDATE `smart_scripts` SET `action_param1`=34 WHERE  `entryorguid`=16027 AND `source_type`=0 AND `id`=3 AND `link`=4;
diff --git a/sql/updates/world/2016_06_01_32_world_from_335_was_2016_06_01_02_world.sql b/sql/updates/world/2016_06_01_32_world_from_335_was_2016_06_01_02_world.sql
new file mode 100644
index 00000000000..e2c27b15339
--- /dev/null
+++ b/sql/updates/world/2016_06_01_32_world_from_335_was_2016_06_01_02_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `quest_template_addon` SET `PrevQuestID`=985 WHERE `ID`=986;
diff --git a/sql/updates/world/2016_06_01_33_world_from_335_was_2016_06_01_03_world.sql b/sql/updates/world/2016_06_01_33_world_from_335_was_2016_06_01_03_world.sql
new file mode 100644
index 00000000000..54beb26b15c
--- /dev/null
+++ b/sql/updates/world/2016_06_01_33_world_from_335_was_2016_06_01_03_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `quest_template_addon` SET `AllowableClasses`=256 WHERE `ID`=397;
diff --git a/sql/updates/world/2016_06_01_34_world_from_335_was_2016_06_01_04_world.sql b/sql/updates/world/2016_06_01_34_world_from_335_was_2016_06_01_04_world.sql
new file mode 100644
index 00000000000..1de1716102b
--- /dev/null
+++ b/sql/updates/world/2016_06_01_34_world_from_335_was_2016_06_01_04_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `quest_template` SET `AllowableRaces`=512 WHERE `ID`=9425;
diff --git a/sql/updates/world/2016_06_01_35_world_from_335_was_2016_06_01_05_world.sql b/sql/updates/world/2016_06_01_35_world_from_335_was_2016_06_01_05_world.sql
new file mode 100644
index 00000000000..3d7a32ac308
--- /dev/null
+++ b/sql/updates/world/2016_06_01_35_world_from_335_was_2016_06_01_05_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `item_loot_template` SET `Chance`=100 WHERE `Entry`=24336;
diff --git a/sql/updates/world/2016_06_01_36_world_from_335_was_2016_06_01_06_world.sql b/sql/updates/world/2016_06_01_36_world_from_335_was_2016_06_01_06_world.sql
new file mode 100644
index 00000000000..9344147e067
--- /dev/null
+++ b/sql/updates/world/2016_06_01_36_world_from_335_was_2016_06_01_06_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `quest_template` SET `AllowableRaces`=0 WHERE `ID`=1486;
diff --git a/sql/updates/world/2016_06_01_37_world_from_335_was_2016_06_01_07_world.sql b/sql/updates/world/2016_06_01_37_world_from_335_was_2016_06_01_07_world.sql
new file mode 100644
index 00000000000..9c159c54cb6
--- /dev/null
+++ b/sql/updates/world/2016_06_01_37_world_from_335_was_2016_06_01_07_world.sql
@@ -0,0 +1,4 @@
+-- 
+DELETE FROM `creature_queststarter` WHERE `quest`=249;
+INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES
+(313, 249);
diff --git a/sql/updates/world/2016_06_01_38_world_from_335_was_2016_06_01_08_world.sql b/sql/updates/world/2016_06_01_38_world_from_335_was_2016_06_01_08_world.sql
new file mode 100644
index 00000000000..356c0561bf2
--- /dev/null
+++ b/sql/updates/world/2016_06_01_38_world_from_335_was_2016_06_01_08_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature_loot_template` SET `Chance`=100 WHERE `Item`=29795;
diff --git a/sql/updates/world/2016_06_01_39_world_from_335_was_2016_06_01_09_world.sql b/sql/updates/world/2016_06_01_39_world_from_335_was_2016_06_01_09_world.sql
new file mode 100644
index 00000000000..5cf06521a19
--- /dev/null
+++ b/sql/updates/world/2016_06_01_39_world_from_335_was_2016_06_01_09_world.sql
@@ -0,0 +1,4 @@
+-- 
+DELETE FROM `quest_template_addon` WHERE `ID`=768;
+INSERT INTO `quest_template_addon` (`ID`, `RequiredSkillID`, `RequiredSkillPoints`) VALUES
+(768, 393, 1);
diff --git a/sql/updates/world/2016_06_01_40_world_from_335_was_2016_06_01_10_world.sql b/sql/updates/world/2016_06_01_40_world_from_335_was_2016_06_01_10_world.sql
new file mode 100644
index 00000000000..abc358431e3
--- /dev/null
+++ b/sql/updates/world/2016_06_01_40_world_from_335_was_2016_06_01_10_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `quest_template_addon` SET `SpecialFlags`=`SpecialFlags`|1 WHERE `ID` IN (961, 3375, 3382, 3483);
diff --git a/sql/updates/world/2016_06_01_41_world_from_335_was_2016_06_01_11_world.sql b/sql/updates/world/2016_06_01_41_world_from_335_was_2016_06_01_11_world.sql
new file mode 100644
index 00000000000..dc0b7b05a33
--- /dev/null
+++ b/sql/updates/world/2016_06_01_41_world_from_335_was_2016_06_01_11_world.sql
@@ -0,0 +1,81 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceEntry`=254 AND `SourceTypeOrReferenceId`=20 AND `ConditionTypeOrReference` IN (8, 28);
+INSERT INTO `conditions` VALUES
+(20, 0, 254, 0, 0, 8, 0, 253, 0, 0, 1, 0, 0, "", "Show question mark for quest 'Digging Through the Dirt'  only if quest 'Bride of the Embalmer' is not rewarded"),
+(20, 0, 254, 0, 0, 28, 0, 253, 0, 0, 1, 0, 0, "", "Show question mark for quest 'Digging Through the Dirt' only if quest 'Bride of the Embalmer' is not completed");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19, 20) AND `SourceEntry` IN (349, 410, 431, 593, 779, 795, 813, 926, 961, 1191, 1462, 1463, 1464, 1714, 1789, 1790, 4041, 6581, 7645, 8508, 8732, 9483, 10850, 10919);
+INSERT INTO `conditions` VALUES
+(19, 0, 349, 0, 0, 9, 0, 348, 0, 0, 0, 0, 0, "", "Show quest 'Stranglethorn Fever' only if quest 'Stranglethorn Fever' is accepted but not completed"),
+(20, 0, 349, 0, 0, 9, 0, 348, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Stranglethorn Fever' only if quest 'Stranglethorn Fever' is accepted but not completed"),
+
+(19, 0, 410, 0, 0, 9, 0, 409, 0, 0, 0, 0, 0, "", "Show quest 'The Dormant Shade' only if quest 'Proving Allegiance' is accepted but not completed"),
+(20, 0, 410, 0, 0, 9, 0, 409, 0, 0, 0, 0, 0, "", "Show question mark for quest 'The Dormant Shade' only if quest 'Proving Allegiance' is accepted but not completed"),
+
+(19, 0, 431, 0, 0, 9, 0, 409, 0, 0, 0, 0, 0, "", "Show quest 'Candles of Beckoning' only if quest 'Proving Allegiance' is accepted but not completed"),
+(20, 0, 431, 0, 0, 9, 0, 409, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Candles of Beckoning' only if quest 'Proving Allegiance' is accepted but not completed"),
+
+(19, 0, 593, 0, 0, 9, 0, 592, 0, 0, 0, 0, 0, "", "Show quest 'Filling the Soul Gem' only if quest 'Saving Yenniku' is accepted but not completed"),
+(20, 0, 593, 0, 0, 9, 0, 592, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Filling the Soul Gem' only if quest 'Saving Yenniku' is accepted but not completed"),
+
+(19, 0, 779, 0, 0, 9, 0, 717, 0, 0, 0, 0, 0, "", "Show quest 'Seal of the Earth' only if quest 'Tremors of the Earth' is accepted but not completed"),
+(20, 0, 779, 0, 0, 9, 0, 717, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Seal of the Earth' only if quest 'Tremors of the Earth' is accepted but not completed"),
+
+(19, 0, 795, 0, 0, 9, 0, 793, 0, 0, 0, 0, 0, "", "Show quest 'Seal of the Earth' only if quest 'Broken Alliances' is accepted but not completed"),
+(20, 0, 795, 0, 0, 9, 0, 793, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Seal of the Earth' only if quest 'Broken Alliances' is accepted but not completed"),
+
+(19, 0, 813, 0, 0, 9, 0, 812, 0, 0, 0, 0, 0, "", "Show quest 'Finding the Antidote' only if quest 'Need for a Cure' is accepted"),
+(20, 0, 813, 0, 0, 9, 0, 812, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Finding the Antidote' only if quest 'Need for a Cure' is accepted but not completed"),
+
+(19, 0, 926, 0, 0, 9, 0, 924, 0, 0, 0, 0, 0, "", "Show quest 'Flawed Power Stone' only if quest 'The Demon Seed' is accepted but not completed"),
+(20, 0, 926, 0, 0, 9, 0, 924, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Flawed Power Stone' only if quest 'The Demon Seed' is accepted but not completed"),
+
+(19, 0, 961, 0, 0, 9, 0, 944, 0, 0, 0, 0, 0, "", "Show quest 'Onu is Meditating' only if quest 'The Demon Seed' is accepted but not completed OR"),
+(20, 0, 961, 0, 0, 9, 0, 944, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Onu is Meditating' only if quest 'The Demon Seed' is accepted but not completed OR"),
+(19, 0, 961, 0, 1, 9, 0, 949, 0, 0, 0, 0, 0, "", "Show quest 'Onu is Meditating' only if quest 'The Twilight Camp' is accepted but not completed"),
+(20, 0, 961, 0, 1, 9, 0, 949, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Onu is Meditating' only if quest 'The Twilight Camp' is accepted but not completed"),
+
+(19, 0, 1191, 0, 0, 9, 0, 1190, 0, 0, 0, 0, 0, "", "Show quest 'Zamek's Distraction' only if quest 'Keeping Pace' is accepted but not completed"),
+(20, 0, 1191, 0, 0, 9, 0, 1190, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Zamek's Distraction' only if quest 'Keeping Pace' is accepted but not completed"),
+
+(19, 0, 1462, 0, 0, 28, 0, 1520, 0, 0, 0, 0, 0, "", "Show quest 'Earth Sapta' only if quest 'Call of Earth' is completed"),
+(20, 0, 1462, 0, 0, 28, 0, 1520, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Earth Sapta' only if quest 'Call of Earth' is completed"),
+
+(19, 0, 1463, 0, 0, 28, 0, 1517, 0, 0, 0, 0, 0, "", "Show quest 'Earth Sapta' only if quest 'Call of Earth' is ompleted"),
+(20, 0, 1463, 0, 0, 28, 0, 1517, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Earth Sapta' only if quest 'Call of Earth' is completed"),
+
+(19, 0, 1464, 0, 0, 9, 0, 1526, 0, 0, 0, 0, 0, "", "Show quest 'Fire Sapta' only if quest 'Call of Fire' is accepted but not completed"),
+(20, 0, 1464, 0, 0, 9, 0, 1526, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Fire Sapta' only if quest 'Call of Fire' is accepted but not completed"),
+
+(19, 0, 1714, 0, 0, 9, 0, 1712, 0, 0, 0, 0, 0, "", "Show quest 'Essence of the Exile' only if quest 'Cyclonian' is accepted but not completed"),
+(20, 0, 1714, 0, 0, 9, 0, 1712, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Essence of the Exile' only if quest 'Cyclonian' is accepted but not completed"),
+
+(19, 0, 1789, 0, 0, 9, 0, 1783, 0, 0, 0, 0, 0, "", "Show quest 'The Symbol of Life' only if quest 'The Tome of Divinity' is accepted but not completed"),
+(20, 0, 1789, 0, 0, 9, 0, 1783, 0, 0, 0, 0, 0, "", "Show question mark for quest 'The Symbol of Life' only if quest 'The Tome of Divinity' is accepted but not completed"),
+
+(19, 0, 1790, 0, 0, 9, 0, 1786, 0, 0, 0, 0, 0, "", "Show quest 'The Symbol of Life' only if quest 'The Tome of Divinity' is accepted but not completed"),
+(20, 0, 1790, 0, 0, 9, 0, 1786, 0, 0, 0, 0, 0, "", "Show question mark for quest 'The Symbol of Life' only if quest 'The Tome of Divinity' is accepted but not completed"),
+
+(19, 0, 4041, 0, 0, 9, 0, 3909, 0, 0, 0, 0, 0, "", "Show quest 'The Videre Elixir' only if quest 'The Videre Elixir' is accepted but not completed"),
+(20, 0, 4041, 0, 0, 9, 0, 3909, 0, 0, 0, 0, 0, "", "Show question mark for quest 'The Videre Elixir' only if quest 'The Videre Elixir' is accepted but not completed"),
+
+(19, 0, 6581, 0, 0, 9, 0, 6571, 0, 0, 0, 0, 0, "", "Show quest 'Warsong Saw Blades' only if quest 'Warsong Supplies' is accepted but not completed"),
+(20, 0, 6581, 0, 0, 9, 0, 6571, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Warsong Saw Blades' only if quest 'Warsong Supplies' is accepted but not completed"),
+
+(19, 0, 7645, 0, 0, 9, 0, 7643, 0, 0, 0, 0, 0, "", "Show quest 'Manna-Enriched Horse Feed' only if quest 'Ancient Equine Spirit' is accepted but not completed"),
+(20, 0, 7645, 0, 0, 9, 0, 7643, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Manna-Enriched Horse Feed' only if quest 'Ancient Equine Spirit' is accepted but not completed"),
+
+(19, 0, 8508, 0, 0, 9, 0, 8507, 0, 0, 0, 0, 0, "", "Show quest 'Field Duty Papers' only if quest 'Field Duty' is accepted but not completed"),
+(20, 0, 8508, 0, 0, 9, 0, 8507, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Field Duty Papers' only if quest 'Field Duty' is accepted but not completed"),
+
+(19, 0, 8732, 0, 0, 9, 0, 8731, 0, 0, 0, 0, 0, "", "Show quest 'Field Duty Papers' only if quest 'Field Duty' is accepted but not completed"),
+(20, 0, 8732, 0, 0, 9, 0, 8731, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Field Duty Papers' only if quest 'Field Duty' is accepted but not completed"),
+
+(19, 0, 9483, 0, 0, 9, 0, 9472, 0, 0, 0, 0, 0, "", "Show quest 'Life's Finer Pleasures' only if quest 'Arelion's Mistress' is accepted but not completed"),
+(20, 0, 9483, 0, 0, 9, 0, 9472, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Life's Finer Pleasures' only if quest 'Arelion's Mistress' is accepted but not completed"),
+
+(19, 0, 10850, 0, 0, 9, 0, 10855, 0, 0, 0, 0, 0, "", "Show quest 'Nether Gas In a Fel Fire Engine' only if quest 'Fel Reavers, No Thanks!' is accepted but not completed"),
+(20, 0, 10850, 0, 0, 9, 0, 10855, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Nether Gas In a Fel Fire Engine' only if quest 'Fel Reavers, No Thanks!' is accepted but not completed"),
+
+(19, 0, 10919, 0, 0, 9, 0, 10916, 0, 0, 0, 0, 0, "", "Show quest 'Fei Fei's Treat' only if quest 'Digging for Prayer Beads' is accepted but not completed"),
+(20, 0, 10919, 0, 0, 9, 0, 10916, 0, 0, 0, 0, 0, "", "Show question mark for quest 'Fei Fei's Treat' only if quest 'Digging for Prayer Beads' is accepted but not completed");
diff --git a/sql/updates/world/2016_06_01_42_world_from_335_was_2016_06_01_12_world.sql b/sql/updates/world/2016_06_01_42_world_from_335_was_2016_06_01_12_world.sql
new file mode 100644
index 00000000000..f6fb906bb70
--- /dev/null
+++ b/sql/updates/world/2016_06_01_42_world_from_335_was_2016_06_01_12_world.sql
@@ -0,0 +1,4 @@
+-- 
+UPDATE `conditions` SET `SourceEntry`=49667 WHERE `SourceEntry`=48679 AND `SourceTypeOrReferenceId`=10 AND `SourceGroup`=10016;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=22137 AND `source_type`=0 AND `id`=7;
+UPDATE `creature_text` SET `emote`=0 WHERE `entry`=19666 AND `groupid`=2 AND `id`=0;