diff --git a/sql/updates/world/2016_01_07_00_world_from_335.sql b/sql/updates/world/2016_01_07_00_world_from_335.sql
new file mode 100644
index 00000000000..57236a6f66e
--- /dev/null
+++ b/sql/updates/world/2016_01_07_00_world_from_335.sql
@@ -0,0 +1,67 @@
+-- Vyragosa (32630) & Time-Lost Proto-Drake (32491) band-aid fix by nelegalno
+SET @POOL := 60002;
+SET @VYRA := 32630;
+SET @TLPD := 32491;
+
+-- TLPD & Vyragosa set respawn to 6h (current 25 sec)
+UPDATE `creature` SET `spawntimesecs`=21600 WHERE `id` IN (@VYRA,@TLPD);
+
+-- Remove old pool data
+DELETE FROM `pool_template` WHERE `entry` IN (@VYRA,@TLPD,@POOL);
+DELETE FROM `pool_creature` WHERE `pool_entry` IN (@VYRA,@TLPD,@POOL);
+DELETE FROM `pool_pool` WHERE `mother_pool`=@POOL OR `pool_id` IN (@VYRA,@TLPD);
+
+-- Insert new pool structure
+INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
+(@POOL,1,"Vyragosa (32630) & Time-Lost Proto Drake (32491)"),
+(@VYRA,1,"Vyragosa (32630)"),
+(@TLPD,1,"Time-Lost Proto Drake (32491)");
+
+INSERT INTO `pool_pool` (`pool_id`, `mother_pool`, `chance`, `description`) VALUES
+(@VYRA,@POOL,80,"Vyragosa (32630)"),
+(@TLPD,@POOL,20,"Time-Lost Proto Drake (32491)");
+
+INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES
+-- spawns 1-20 for both NPCs are from old pool
+(202461,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 1"),
+(202462,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 2"),
+(202463,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 3"),
+(202464,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 4"),
+(202465,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 5"),
+(202466,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 6"),
+(202467,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 7"),
+(202468,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 8"),
+(202469,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 9"),
+(202470,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 10"),
+(202471,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 11"),
+(202472,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 12"),
+(202473,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 13"),
+(202474,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 14"),
+(202475,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 15"),
+(202476,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 16"),
+(202477,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 17"),
+(202478,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 18"),
+(202479,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 19"),
+(202480,@TLPD,0,"Time-Lost Proto Drake (32491) - Spawn 20"),
+(202441,@VYRA,0,"Vyragosa (32630) - Spawn 1"),
+(202442,@VYRA,0,"Vyragosa (32630) - Spawn 2"),
+(202443,@VYRA,0,"Vyragosa (32630) - Spawn 3"),
+(202444,@VYRA,0,"Vyragosa (32630) - Spawn 4"),
+(202445,@VYRA,0,"Vyragosa (32630) - Spawn 5"),
+(202446,@VYRA,0,"Vyragosa (32630) - Spawn 6"),
+(202447,@VYRA,0,"Vyragosa (32630) - Spawn 7"),
+(202448,@VYRA,0,"Vyragosa (32630) - Spawn 8"),
+(202449,@VYRA,0,"Vyragosa (32630) - Spawn 9"),
+(202450,@VYRA,0,"Vyragosa (32630) - Spawn 10"),
+(202451,@VYRA,0,"Vyragosa (32630) - Spawn 11"),
+(202452,@VYRA,0,"Vyragosa (32630) - Spawn 12"),
+(202453,@VYRA,0,"Vyragosa (32630) - Spawn 13"),
+(202454,@VYRA,0,"Vyragosa (32630) - Spawn 14"),
+(202455,@VYRA,0,"Vyragosa (32630) - Spawn 15"),
+(202456,@VYRA,0,"Vyragosa (32630) - Spawn 16"),
+(202457,@VYRA,0,"Vyragosa (32630) - Spawn 17"),
+(202458,@VYRA,0,"Vyragosa (32630) - Spawn 18"),
+(202459,@VYRA,0,"Vyragosa (32630) - Spawn 19"),
+(202460,@VYRA,0,"Vyragosa (32630) - Spawn 20"),
+-- spawned in TDB but not in the old pool
+(202602,@VYRA,0,"Vyragosa (32630) - Spawn 21");
diff --git a/sql/updates/world/2016_01_07_01_world_from_335.sql b/sql/updates/world/2016_01_07_01_world_from_335.sql
new file mode 100644
index 00000000000..3f7f01449fc
--- /dev/null
+++ b/sql/updates/world/2016_01_07_01_world_from_335.sql
@@ -0,0 +1,20 @@
+DELETE FROM `spell_area` WHERE `spell` IN(52214,50735);
+
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES 
+(52214, 3711, 12572, 12572, 0, 0, 2, 1, 74, 11), -- Gods Like Shiny Things 
+(52214, 3711, 12704, 12704, 0, 0, 2, 1, 74, 11), -- Appeasing the Great Rainstone 
+(50735, 3711, 12532, 12532, 0, 0, 2, 1, 74, 11), -- Flown the Coop! 
+(50735, 3711, 12702, 12702, 0, 0, 2, 1, 74, 11); -- Chicken Party! 
+
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=28138 AND `source_type`=0 AND `id`=3 AND `link`=0;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=28138 AND `source_type`=0 AND `id`=1 AND `link`=0;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=28138 AND `source_type`=0 AND `id`=2 AND `link`=0;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=28138 AND `source_type`=0 AND `id`=0 AND `link`=0;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=28027 AND `source_type`=0 AND `id`=9 AND `link`=0;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=28027 AND `source_type`=0 AND `id`=10 AND `link`=0;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=28027 AND `source_type`=0 AND `id`=11 AND `link`=0;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=28120 AND `source_type`=0 AND `id`=13 AND `link`=0;
+
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE  `entryorguid` IN(28214,28215,28216, 28120, 28121,28122,28362) AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_param3`=60000, `event_param4`=60000 WHERE  `entryorguid`=28362 AND `source_type`=0 AND `id`=0 AND `link`=0;
+
diff --git a/sql/updates/world/2016_01_07_02_world_from_335.sql b/sql/updates/world/2016_01_07_02_world_from_335.sql
new file mode 100644
index 00000000000..dc1064a75b9
--- /dev/null
+++ b/sql/updates/world/2016_01_07_02_world_from_335.sql
@@ -0,0 +1,24 @@
+-- Add gossip texts to menu
+DELETE FROM `gossip_menu_option` WHERE `menu_id` = 8718;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES
+(8718, 0, 0, 'Yes, I''d love a ride to Blackwind Landing.',21550,1,1,0,0,0,0,'',0);
+
+DELETE FROM `npc_text` WHERE `ID` = 10977;
+INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `Probability0`, `em0_0`, `em0_1`, `em0_2`, `em0_3`, `em0_4`, `em0_5`) VALUES
+(10977, '', 'Hey, comrade.  If you get yourself in good with the Skyguard, I can offer you a direct flight to our base, Blackwind Landing, in the Skethyl Mountains.$B$BDo you like my beautiful nether ray?  It is lovely.', 21547, 0, 1, 0, 1, 0, 6, 0, 0);
+-- Other npc_text (10978) is already set in DB
+
+-- Migrate NPC to use SmartAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 23413;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14, 15) AND `SourceGroup` = 8718;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,8718,10977,0,0,5,0,1031,224,0,1,0,'','Skyguard Handler Irena - Show gossip menu text below Honored reputation with faction 1031'),
+(14,8718,10978,0,0,5,0,1031,224,0,0,0,'','Skyguard Handler Irena - Show gossip menu text above Honored reputation with faction 1031'),
+(15,8718,0,0,0,5,0,1031,224,0,0,0,'','Skyguard Handler Irena - Show gossip option 0 if player has reputation Honored or above with faction 1031');
+
+-- Create SmartAI for Skyguard Handler Irena
+DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 23413);
+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
+(23413,0,0,1,62,0,100,0,8718,0,0,0,11,41278,0,0,0,0,0,7,0,0,0,0,0,0,0,'Skyguard Handler Irena - On Gossip Option 0 Selected - Cast Spell 41278'),
+(23413,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Skyguard Handler Irena - On Linked Actions - Close Gossip');
diff --git a/sql/updates/world/2016_01_07_03_world_from_335.sql b/sql/updates/world/2016_01_07_03_world_from_335.sql
new file mode 100644
index 00000000000..64909129e60
--- /dev/null
+++ b/sql/updates/world/2016_01_07_03_world_from_335.sql
@@ -0,0 +1,21 @@
+-- Add gossip texts to menu
+DELETE FROM `gossip_menu_option` WHERE `menu_id` = 8719;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES
+(8719,0,0,'Absolutely!  Send me to the Skyguard Outpost.',21553,1,1,0,0,0,0,'',0);
+-- This was already here but I think rather enumerate from 0 than 1 in gossip_menu_option
+
+-- Migrate NPC to use SmartAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 23415;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14, 15) AND `SourceGroup` = 8719;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,8719,10980,0,0,5,0,1031,224,0,1,0,'','Skyguard Handler Deesak - Show gossip menu text below Honored reputation with faction 1031'),
+(14,8719,10979,0,0,5,0,1031,224,0,0,0,'','Skyguard Handler Deesak - Show gossip menu text above Honored reputation with faction 1031'),
+(15,8719,0,0,0,5,0,1031,224,0,0,0,'','Skyguard Handler Deesak - Show gossip option 0 if player has reputation Honored or above with faction 1031');
+-- Not sure if the missing condition is necessary, but it makes things a lot clearer when looking at the table.
+
+-- Create SmartAI for Skyguard Handler Deesak
+DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 23415);
+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
+(23415,0,0,1,62,0,100,0,8719,0,0,0,11,41279,0,0,0,0,0,7,0,0,0,0,0,0,0,'Skyguard Handler Deesak - On Gossip Option 0 Selected - Cast Spell 41279'),
+(23415,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Skyguard Handler Deesak - On Linked Actions - Close Gossip');
diff --git a/sql/updates/world/2016_01_07_04_world_from_335.sql b/sql/updates/world/2016_01_07_04_world_from_335.sql
new file mode 100644
index 00000000000..d36dda80e50
--- /dev/null
+++ b/sql/updates/world/2016_01_07_04_world_from_335.sql
@@ -0,0 +1,25 @@
+-- Add sniffed gossip texts to menu
+DELETE FROM `gossip_menu_option` WHERE `menu_id` = 7970;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES
+(7970, 0, 0, 'I''m on a bombing mission for Forward Commander Kingston.  I need a gryphon destroyer!',18198,1,1,0,0,0,0,'',0),
+(7970, 1, 0, 'Send me to Shatter Point!',17935,1,1,0,0,0,0,'',0);
+
+-- Migrate NPC to use SmartAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '', `gossip_menu_id` = 7970 WHERE `entry` = 19409;
+
+-- Condition: Gossip menu ID 0 needs either quest ID 10146 to be incomplete.
+-- Condition: Gossip menu ID 1 needs quest ID 10340 to not be rewarded
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 15 AND `SourceGroup` = 7970 AND `SourceEntry`IN (0,1);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7970,0,0,0,9,0,10146,0,0,0,0,'','Wing Commander Dabir''ee - Show gossip option 0 if player has taken quest ID 10146'),
+(15,7970,1,0,0,8,0,10340,0,0,1,0,'','Wing Commander Dabir''ee - Show gossip option 1 if quest ID 10340 is not rewarded');
+
+-- Create SmartAI for Wing Commander Dabir'ee
+DELETE FROM `smart_scripts` WHERE (source_type = 0 AND entryorguid = 19409);
+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
+(19409,0,0,2,62,0,100,0,7970,0,0,0,11,33768,0,0,0,0,0,7,0,0,0,0,0,0,0,'Wing Commander Dabir''ee - On Gossip Option 0 Selected - Cast Spell 33768'),
+(19409,0,1,2,62,0,100,0,7970,1,0,0,11,35069,0,0,0,0,0,7,0,0,0,0,0,0,0,'Wing Commander Dabir''ee - On Gossip Option 1 Selected - Cast Spell 35069'),
+(19409,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Wing Commander Dabir''ee - On Linked Actions - Close Gossip');
+
+-- Misc creature fixes
+UPDATE `creature` SET `MovementType` = 0 WHERE id = 22987 AND guid IN (79007, 79008, 79009);
diff --git a/sql/updates/world/2016_01_07_05_world_from_335.sql b/sql/updates/world/2016_01_07_05_world_from_335.sql
new file mode 100644
index 00000000000..4a15aa405ec
--- /dev/null
+++ b/sql/updates/world/2016_01_07_05_world_from_335.sql
@@ -0,0 +1,2 @@
+-- 
+DELETE FROM `creature` WHERE `id`=22972;