diff --git a/sql/updates/world/2016_04_21_00_world_from_335_was_2016_04_20_00_world.sql b/sql/updates/world/2016_04_21_00_world_from_335_was_2016_04_20_00_world.sql
new file mode 100644
index 0000000000..776254b8fb
--- /dev/null
+++ b/sql/updates/world/2016_04_21_00_world_from_335_was_2016_04_20_00_world.sql
@@ -0,0 +1,7 @@
+--
+-- Add missing Gnomeregan Conjuror/Silvermoon Magister SAI (Cosmetic)
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE  `entry` IN (19006, 19007);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (19006, 19007) 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 
+(19006, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 32783, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Silvermoon Magister - On Reset - Cast \'Arcane Channeling\''),
+(19007, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 32783, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gnomeregan Conjuror - On Reset - Cast \'Arcane Channeling\'');
diff --git a/sql/updates/world/2016_04_21_01_world_from_335_was_2016_04_20_01_world.sql b/sql/updates/world/2016_04_21_01_world_from_335_was_2016_04_20_01_world.sql
new file mode 100644
index 0000000000..19bd02a91f
--- /dev/null
+++ b/sql/updates/world/2016_04_21_01_world_from_335_was_2016_04_20_01_world.sql
@@ -0,0 +1,5 @@
+--
+-- Hairy Herring Heads, Withered Batwings, Wasp's Wings, Muddy Mire Maggots, Knotroot, Spekled Guano, Seasoned Slider Cider, Pickled Eagle Egg, Prismatic Mojo, Raptor Claw
+-- Pulverized Gargoyle Teeth, Icerown Bottled Water, Putrid Pirate Perspiration, Spiky Spider Eggs, Abomination Guts, Amberseed, Shrunken Dragom's Claw, Crystallized Hogsnot
+-- Ancient Ectoplasm, Chrushed Basilisk Crystals, Blight Crystal, Frozen Spider Ichor, Trollbane, Ghoul Drool, 
+UPDATE `gameobject` SET `spawntimesecs` = 0 WHERE `id` IN (190459,190461,190462,190463,190464,190465,190466,190467,190468,190469,190470,190471,190472,190473,190474,190476,190477,190478,190479,190480,190481,190482,191180,191181,191182);
diff --git a/sql/updates/world/2016_04_21_02_world_from_335_was_2016_04_20_02_world.sql b/sql/updates/world/2016_04_21_02_world_from_335_was_2016_04_20_02_world.sql
new file mode 100644
index 0000000000..743f1fdab5
--- /dev/null
+++ b/sql/updates/world/2016_04_21_02_world_from_335_was_2016_04_20_02_world.sql
@@ -0,0 +1,89 @@
+--
+DELETE FROM `creature_addon` WHERE `guid` IN (202936, 202878, 202950, 202931, 202875, 202884, 202914, 202925, 202934, 202944, 202879, 202945, 202898, 202910, 202912, 202909, 202870, 202949, 202903, 202920, 202922, 202924, 202926, 202939, 202888, 202940, 202882, 202947, 202897, 202937, 202915, 202929, 202935, 202872, 202887, 202942, 202948, 202896, 202900, 202916, 202886, 202923, 202894, 202927, 202913, 202906, 202876, 202941, 202881, 202890, 202907, 202904, 202874, 202880, 202877, 202905, 202873, 202908, 202946, 202917, 202928, 202932, 202943, 202883, 202895, 202951, 202901, 202911, 202885, 202899, 202933, 202868, 202938, 202919, 202921, 202918, 202893, 202891, 202889, 202866, 202871, 202892, 202930, 202902, 202869, 202867);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(202936, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202878, 0, 0, 0, 1, 0, '66321 55944 66370'), -- Tauren Coliseum Spectator
+(202950, 0, 0, 0, 1, 0, '66321 55944 66361'), -- Argent Crusade Spectator, 66361 - Argent Crusade Pennant
+(202931, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Draenei
+(202875, 0, 0, 0, 1, 0, '66321 55944'), -- Troll Coliseum Spectator
+(202884, 0, 0, 0, 1, 0, '66321 55944 66369'), -- Orcish Coliseum Spectator
+(202914, 0, 0, 0, 1, 0, '66321 55944'), -- Human Coliseum Spectator
+(202925, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Orc
+(202934, 0, 0, 0, 1, 0, '66321 55944 66361'), -- Argent Crusade Spectator
+(202944, 0, 0, 0, 1, 0, '66321 55944 66361'), -- Argent Crusade Spectator
+(202879, 0, 0, 0, 1, 0, '66321 55944 66370'), -- Tauren Coliseum Spectator
+(202945, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202898, 0, 0, 0, 1, 0, '66321 55944'), -- Blood Elf Coliseum Spectator
+(202910, 0, 0, 0, 1, 0, '66321 55944 66366'), -- Gnomish Coliseum Spectator
+(202912, 0, 0, 0, 1, 0, '66321 55944'), -- Human Coliseum Spectator
+(202909, 0, 0, 0, 1, 0, '66321 55944'), -- Gnomish Coliseum Spectator
+(202870, 0, 0, 0, 1, 0, '66321 55944'), -- Dwarven Coliseum Spectator
+(202949, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202903, 0, 0, 0, 1, 0, '66321 55944 66362'), -- Draenei Coliseum Spectator
+(202920, 0, 0, 0, 1, 0, '66321 55944'), -- Night Elf Coliseum Spectator
+(202922, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Horde
+(202924, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Human
+(202926, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Troll
+(202939, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202888, 0, 0, 0, 1, 0, '66321 55944'), -- Orcish Coliseum Spectator
+(202940, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202882, 0, 0, 0, 1, 0, '66321 55944'), -- Tauren Coliseum Spectator
+(202947, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202897, 0, 0, 0, 1, 0, '66321 55944 66360'), -- Blood Elf Coliseum Spectator, 66360 - Silvermoon Pennant
+(202937, 0, 0, 0, 1, 0, '66321 55944 66361'), -- Argent Crusade Spectator
+(202915, 0, 0, 0, 1, 0, '66321 55944 66367'), -- Human Coliseum Spectator
+(202929, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Undead
+(202935, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202872, 0, 0, 0, 1, 0, '66321 55944 66371'), -- Troll Coliseum Spectator
+(202887, 0, 0, 0, 1, 0, '66321 55944'), -- Orcish Coliseum Spectator
+(202942, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202948, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202896, 0, 0, 0, 1, 0, '66321 55944'), -- Blood Elf Coliseum Spectator
+(202900, 0, 0, 0, 1, 0, '66321 55944'), -- Draenei Coliseum Spectator
+(202916, 0, 0, 0, 1, 0, '66321 55944 66367'), -- Human Coliseum Spectator
+(202886, 0, 0, 0, 1, 0, '66321 55944'), -- Orcish Coliseum Spectator
+(202923, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Alliance
+(202894, 0, 0, 0, 1, 0, '66321 55944 66360'), -- Blood Elf Coliseum Spectator
+(202927, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Tauren
+(202913, 0, 0, 0, 1, 0, '66321 55944'), -- Human Coliseum Spectator
+(202906, 0, 0, 0, 1, 0, '66321 55944'), -- Gnomish Coliseum Spectator
+(202876, 0, 0, 0, 1, 0, '66321 55944'), -- Troll Coliseum Spectator
+(202941, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202881, 0, 0, 0, 1, 0, '66321 55944'), -- Tauren Coliseum Spectator
+(202890, 0, 0, 0, 1, 0, '66321 55944 66365'), -- Forsaken Coliseum Spectator
+(202907, 0, 0, 0, 1, 0, '66321 55944 66366'), -- Gnomish Coliseum Spectator
+(202904, 0, 0, 0, 1, 0, '66321 55944 66362'), -- Draenei Coliseum Spectator
+(202874, 0, 0, 0, 1, 0, '66321 55944'), -- Troll Coliseum Spectator
+(202880, 0, 0, 0, 1, 0, '66321 55944'), -- Tauren Coliseum Spectator
+(202877, 0, 0, 0, 1, 0, '66321 55944 66371'), -- Troll Coliseum Spectator, 66371 - Sen'jin Pennant
+(202905, 0, 0, 0, 1, 0, '66321 55944'), -- Gnomish Coliseum Spectator
+(202873, 0, 0, 0, 1, 0, '66321 55944 66371'), -- Troll Coliseum Spectator
+(202908, 0, 0, 0, 1, 0, '66321 55944 66366'), -- Gnomish Coliseum Spectator
+(202946, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202917, 0, 0, 0, 1, 0, '66321 55944'), -- Night Elf Coliseum Spectator
+(202928, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Blood Elf
+(202932, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Night Elf
+(202943, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202883, 0, 0, 0, 1, 0, '66321 55944 66369'), -- Orcish Coliseum Spectator
+(202895, 0, 0, 0, 1, 0, '66321 55944 66360'), -- Blood Elf Coliseum Spectator
+(202951, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202901, 0, 0, 0, 1, 0, '66321 55944 66362'), -- Draenei Coliseum Spectator
+(202911, 0, 0, 0, 1, 0, '66321 55944'), -- Human Coliseum Spectator
+(202885, 0, 0, 0, 1, 0, '66321 55944'), -- Orcish Coliseum Spectator
+(202899, 0, 0, 0, 1, 0, '66321 55944'), -- Blood Elf Coliseum Spectator
+(202933, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Gnome
+(202868, 0, 0, 0, 1, 0, '66321 55944 66363'), -- Dwarven Coliseum Spectator, 66363 - Ironforge Pennant
+(202938, 0, 0, 0, 1, 0, '66321 55944'), -- Argent Crusade Spectator
+(202919, 0, 0, 0, 1, 0, '66321 55944 66368'), -- Night Elf Coliseum Spectator, 66368 - Darnassus Pennant
+(202921, 0, 0, 0, 1, 0, '66321 55944 66368'), -- Night Elf Coliseum Spectator
+(202918, 0, 0, 0, 1, 0, '66321 55944'), -- Night Elf Coliseum Spectator
+(202893, 0, 0, 0, 1, 0, '66321 55944'), -- Forsaken Coliseum Spectator
+(202891, 0, 0, 0, 1, 0, '66321 55944'), -- Forsaken Coliseum Spectator
+(202889, 0, 0, 0, 1, 0, '66321 55944 66365'), -- Forsaken Coliseum Spectator
+(202866, 0, 0, 0, 1, 0, '66321 55944 66363'), -- Dwarven Coliseum Spectator, 66363 - Ironforge Pennant
+(202871, 0, 0, 0, 1, 0, '66321 55944 66363'), -- Dwarven Coliseum Spectator
+(202892, 0, 0, 0, 1, 0, '66321 55944 66365'), -- Forsaken Coliseum Spectator, 66365 - Undercity Pennant
+(202930, 0, 0, 0, 1, 0, '66321 55944'), -- [ph] Argent Raid Spectator - FX - Dwarf
+(202902, 0, 0, 0, 1, 0, '66321 55944'), -- Draenei Coliseum Spectator
+(202869, 0, 0, 0, 1, 0, '66321 55944'), -- Dwarven Coliseum Spectator
+(202867, 0, 0, 0, 1, 0, '66321 55944'); -- Dwarven Coliseum Spectator
diff --git a/sql/updates/world/2016_04_21_04_world_from_335_was_2016_04_20_03_world.sql b/sql/updates/world/2016_04_21_04_world_from_335_was_2016_04_20_03_world.sql
new file mode 100644
index 0000000000..11fc8de732
--- /dev/null
+++ b/sql/updates/world/2016_04_21_04_world_from_335_was_2016_04_20_03_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (27435) 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 
+(27435, 0, 2, 0, 63, 0, 100, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Wintergarde Mine Bomb - Just created - Set immune to NPC');