diff --git a/sql/updates/world/2015_08_10_01_world.sql b/sql/updates/world/2015_08_10_01_world.sql
index 635b51e9d7..c9dd99bf5f 100644
--- a/sql/updates/world/2015_08_10_01_world.sql
+++ b/sql/updates/world/2015_08_10_01_world.sql
@@ -17,4 +17,4 @@ UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=44617;
 DELETE FROM `smart_scripts` WHERE `entryorguid` IN (44617) 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
 (44617, 0, 0, 0, 8, 0, 100, 0, 774, 0, 0, 0, 33, 44175, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Wounded Sentinel - On spell hit - Kill credit'),
-(44617,0,1,0,8,0,100,0,2061,0,0,0,33,44175,0,0,0,0,0,7,0,0,0,0,0,0,0,"Wounded Sentinel- On spell hit - Credit kill");
\ No newline at end of file
+(44617,0,1,0,8,0,100,0,2061,0,0,0,33,44175,0,0,0,0,0,7,0,0,0,0,0,0,0,"Wounded Sentinel- On spell hit - Credit kill");
diff --git a/sql/updates/world/2015_09_11_00_world_from_335.sql b/sql/updates/world/2015_09_11_00_world_from_335.sql
new file mode 100644
index 0000000000..828a626851
--- /dev/null
+++ b/sql/updates/world/2015_09_11_00_world_from_335.sql
@@ -0,0 +1,234 @@
+-- Stratholme - King's Square
+-- 3.x +4.x +6.x
+-- rndmmovement
+UPDATE `creature` SET `spawndist`=2 WHERE  `guid` IN (53148, 52999, 53000, 53000, 53149);
+-- pathing
+-- patchwerk 1
+SET @NPC := 53954;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3656.723,`position_y`=-3513.025,`position_z`=136.9099 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3656.723,-3513.025,136.9099,0,0,0,0,100,0),
+(@PATH,2,3657.473,-3512.525,136.9099,0,0,0,0,100,0),
+(@PATH,3,3658.473,-3498.275,136.6599,0,0,0,0,100,0),
+(@PATH,4,3658.507,-3497.959,136.9155,0,0,0,0,100,0),
+(@PATH,5,3658.757,-3494.459,136.9155,0,0,0,0,100,0),
+(@PATH,6,3654.507,-3492.959,136.9155,0,0,0,0,100,0),
+(@PATH,7,3651.257,-3491.459,136.9155,0,0,0,0,100,0),
+(@PATH,8,3645.507,-3488.959,137.4155,0,0,0,0,100,0),
+(@PATH,9,3645.125,-3488.808,137.3199,0,0,0,0,100,0),
+(@PATH,10,3643.375,-3488.058,137.5699,0,0,0,0,100,0),
+(@PATH,11,3638.125,-3490.058,137.3199,0,0,0,0,100,0),
+(@PATH,12,3635.125,-3491.308,137.5699,0,0,0,0,100,0),
+(@PATH,13,3627.464,-3493.699,137.235,0,0,0,0,100,0),
+(@PATH,14,3622.464,-3493.949,137.485,0,0,0,0,100,0),
+(@PATH,15,3613.366,-3494.758,136.9154,0,0,0,0,100,0),
+(@PATH,16,3609.366,-3491.258,136.6654,0,0,0,0,100,0),
+(@PATH,17,3602.366,-3485.008,135.9154,0,0,0,0,100,0),
+(@PATH,18,3595.843,-3479.371,135.1627,0,0,0,0,100,0),
+(@PATH,19,3600.593,-3486.121,135.9127,0,0,0,0,100,0),
+(@PATH,20,3605.343,-3493.371,136.6627,0,0,0,0,100,0),
+(@PATH,21,3612.294,-3503.09,137.4564,0,0,0,0,100,0),
+(@PATH,22,3613.294,-3504.09,137.4564,0,0,0,0,100,0),
+(@PATH,23,3620.044,-3512.09,137.4564,0,0,0,0,100,0),
+(@PATH,24,3622.044,-3514.34,137.2064,0,0,0,0,100,0),
+(@PATH,25,3628.683,-3521.636,137.0146,0,0,0,0,100,0),
+(@PATH,26,3632.433,-3521.136,136.7646,0,0,0,0,100,0),
+(@PATH,27,3635.433,-3520.636,136.7646,0,0,0,0,100,0),
+(@PATH,28,3639.933,-3519.886,137.0146,0,0,0,0,100,0),
+(@PATH,29,3641.183,-3519.886,136.7646,0,0,0,0,100,0),
+(@PATH,30,3647.269,-3518.891,136.7158,0,0,0,0,100,0),
+(@PATH,31,3649.769,-3517.391,136.7158,0,0,0,0,100,0),
+(@PATH,32,3656.769,-3513.141,136.9658,0,0,0,0,100,0);
+
+-- patchwerk 2
+SET @NPC := 53943;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3693.587,`position_y`=-3392.627,`position_z`=132.258 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3693.587,-3392.627,132.258,0,0,0,0,100,0),
+(@PATH,2,3692.087,-3390.627,132.008,0,0,0,0,100,0),
+(@PATH,3,3690.087,-3386.627,131.508,0,0,0,0,100,0),
+(@PATH,4,3688.087,-3382.877,130.758,0,0,0,0,100,0),
+(@PATH,5,3685.837,-3379.127,130.008,0,0,0,0,100,0),
+(@PATH,6,3682.587,-3373.127,129.508,0,0,0,0,100,0),
+(@PATH,7,3679.837,-3367.627,128.758,0,0,0,0,100,0),
+(@PATH,8,3677.837,-3364.127,128.008,0,0,0,0,100,0),
+(@PATH,9,3677.505,-3363.911,127.5753,0,0,0,0,100,0),
+(@PATH,10,3676.505,-3361.911,127.0753,0,0,0,0,100,0),
+(@PATH,11,3675.255,-3360.161,126.8253,0,0,0,0,100,0),
+(@PATH,12,3674.505,-3358.911,126.3253,0,0,0,0,100,0),
+(@PATH,13,3671.505,-3354.411,125.8253,0,0,0,0,100,0),
+(@PATH,14,3669.005,-3350.161,125.5753,0,0,0,0,100,0),
+(@PATH,15,3667.255,-3347.411,125.3253,0,0,0,0,100,0),
+(@PATH,16,3662.255,-3339.911,124.5753,0,0,0,0,100,0),
+(@PATH,17,3659.744,-3335.81,124.2587,0,0,0,0,100,0),
+(@PATH,18,3661.244,-3333.56,124.0087,0,0,0,0,100,0),
+(@PATH,19,3666.244,-3325.56,124.0087,0,0,0,0,100,0),
+(@PATH,20,3667.994,-3322.81,124.0087,0,0,0,0,100,0),
+(@PATH,21,3668.494,-3321.31,124.5087,0,0,0,0,100,0),
+(@PATH,22,3673.494,-3313.06,126.5087,0,0,0,0,100,0),
+(@PATH,23,3676.687,-3308.217,127.0456,0,0,0,0,100,0),
+(@PATH,24,3678.437,-3301.217,127.5456,0,0,0,0,100,0),
+(@PATH,25,3680.437,-3292.967,128.0456,0,0,0,0,100,0),
+(@PATH,26,3681.687,-3288.717,128.2956,0,0,0,0,100,0),
+(@PATH,27,3682.687,-3285.467,128.0456,0,0,0,0,100,0),
+(@PATH,28,3683.687,-3280.967,128.0456,0,0,0,0,100,0),
+(@PATH,29,3684.886,-3277.052,127.8707,0,0,0,0,100,0),
+(@PATH,30,3691.386,-3272.302,128.1207,0,0,0,0,100,0),
+(@PATH,31,3696.886,-3268.552,128.1207,0,0,0,0,100,0),
+(@PATH,32,3703.386,-3263.302,127.8707,0,0,0,0,100,0),
+(@PATH,33,3703.537,-3263.307,127.8513,0,0,0,0,100,0),
+(@PATH,34,3696.787,-3268.307,128.1013,0,0,0,0,100,0),
+(@PATH,35,3691.537,-3272.307,128.1013,0,0,0,0,100,0),
+(@PATH,36,3684.775,-3277.28,127.9393,0,0,0,0,100,0),
+(@PATH,37,3683.775,-3281.03,127.9393,0,0,0,0,100,0),
+(@PATH,38,3682.525,-3285.28,127.9393,0,0,0,0,100,0),
+(@PATH,39,3681.775,-3288.78,128.1893,0,0,0,0,100,0),
+(@PATH,40,3680.775,-3292.78,127.9393,0,0,0,0,100,0),
+(@PATH,41,3678.525,-3301.28,127.4393,0,0,0,0,100,0),
+(@PATH,42,3676.775,-3307.78,126.9393,0,0,0,0,100,0),
+(@PATH,43,3676.495,-3308.055,126.7956,0,0,0,0,100,0),
+(@PATH,44,3676.495,-3308.305,126.7956,0,0,0,0,100,0),
+(@PATH,45,3673.495,-3313.055,126.2956,0,0,0,0,100,0),
+(@PATH,46,3668.495,-3321.305,124.5456,0,0,0,0,100,0),
+(@PATH,47,3667.995,-3322.555,124.0456,0,0,0,0,100,0),
+(@PATH,48,3666.245,-3325.555,124.0456,0,0,0,0,100,0),
+(@PATH,49,3661.245,-3333.555,124.0456,0,0,0,0,100,0),
+(@PATH,50,3661.398,-3333.665,124.0029,0,0,0,0,100,0),
+(@PATH,51,3659.898,-3336.165,124.2529,0,0,0,0,100,0),
+(@PATH,52,3662.398,-3339.915,124.5029,0,0,0,0,100,0),
+(@PATH,53,3667.148,-3347.165,125.2529,0,0,0,0,100,0),
+(@PATH,54,3668.898,-3349.915,125.2529,0,0,0,0,100,0),
+(@PATH,55,3671.648,-3354.415,125.7529,0,0,0,0,100,0),
+(@PATH,56,3674.398,-3358.915,126.2529,0,0,0,0,100,0),
+(@PATH,57,3675.398,-3360.165,126.7529,0,0,0,0,100,0);
+
+-- patchwerk 3
+SET @NPC := 53953;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3548.131,`position_y`=-3350.274,`position_z`=129.7909 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3548.131,-3350.274,129.7909,0,0,0,0,100,0),
+(@PATH,2,3553.131,-3348.024,129.2909,0,0,0,0,100,0),
+(@PATH,3,3559.131,-3345.524,129.2909,0,0,0,0,100,0),
+(@PATH,4,3566.631,-3342.524,129.7909,0,0,0,0,100,0),
+(@PATH,5,3568.131,-3341.774,129.5409,0,0,0,0,100,0),
+(@PATH,6,3575.881,-3338.274,128.7909,0,0,0,0,100,0),
+(@PATH,7,3578.131,-3337.274,128.5409,0,0,0,0,100,0),
+(@PATH,8,3586.131,-3334.024,128.0409,0,0,0,0,100,0),
+(@PATH,9,3586.197,-3333.996,128.0313,0,0,0,0,100,0),
+(@PATH,10,3586.697,-3333.746,128.0313,0,0,0,0,100,0),
+(@PATH,11,3576.947,-3333.746,128.7813,0,0,0,0,100,0),
+(@PATH,12,3569.697,-3333.496,129.2813,0,0,0,0,100,0),
+(@PATH,13,3565.197,-3333.496,129.5313,0,0,0,0,100,0),
+(@PATH,14,3560.02,-3333.251,129.5826,0,0,0,0,100,0),
+(@PATH,15,3542.77,-3327.501,129.5826,0,0,0,0,100,0),
+(@PATH,16,3537.52,-3325.501,129.5826,0,0,0,0,100,0),
+(@PATH,17,3533.931,-3324.1,130.2483,0,0,0,0,100,0),
+(@PATH,18,3526.181,-3320.85,130.9983,0,0,0,0,100,0),
+(@PATH,19,3526.113,-3320.813,131.0822,0,0,0,0,100,0),
+(@PATH,20,3534.17,-3324.386,129.9323,0,0,0,0,100,0),
+(@PATH,21,3537.67,-3325.636,129.6823,0,0,0,0,100,0),
+(@PATH,22,3542.67,-3327.386,129.6823,0,0,0,0,100,0),
+(@PATH,23,3560.328,-3333.262,129.4392,0,0,0,0,100,0),
+(@PATH,24,3565.078,-3333.262,129.4392,0,0,0,0,100,0),
+(@PATH,25,3569.578,-3333.262,129.1892,0,0,0,0,100,0),
+(@PATH,26,3577.078,-3333.262,128.6892,0,0,0,0,100,0),
+(@PATH,27,3586.078,-3333.512,128.1892,0,0,0,0,100,0),
+(@PATH,28,3586.124,-3333.573,128.1801,0,0,0,0,100,0),
+(@PATH,29,3586.624,-3333.573,127.9301,0,0,0,0,100,0),
+(@PATH,30,3578.124,-3337.323,128.6801,0,0,0,0,100,0),
+(@PATH,31,3576.374,-3338.073,128.6801,0,0,0,0,100,0),
+(@PATH,32,3568.124,-3341.823,129.4301,0,0,0,0,100,0),
+(@PATH,33,3566.624,-3342.323,129.6801,0,0,0,0,100,0),
+(@PATH,34,3559.124,-3345.573,129.4301,0,0,0,0,100,0),
+(@PATH,35,3553.124,-3348.073,129.4301,0,0,0,0,100,0),
+(@PATH,36,3547.868,-3350.434,130.0947,0,0,0,0,100,0),
+(@PATH,37,3546.368,-3354.684,130.8447,0,0,0,0,100,0),
+(@PATH,38,3543.118,-3365.184,131.8447,0,0,0,0,100,0),
+(@PATH,39,3540.868,-3371.184,132.5947,0,0,0,0,100,0),
+(@PATH,40,3538.868,-3376.434,132.5947,0,0,0,0,100,0);
+
+-- ghoul 1
+SET @NPC := 53594;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 1, 3473.78, -3366.93, 136.507, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 3490.31, -3376.55, 135.208, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 3503.41, -3381.49, 134.565, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 3535.2, -3388.79, 132.377, 0, 0, 0, 0, 100, 0),
+(@PATH, 5, 3537.69, -3394.79, 132.377, 0, 0, 0, 0, 100, 0),
+(@PATH, 6, 3547.23, -3422.23, 135.428, 0, 0, 0, 0, 100, 0),
+(@PATH, 7, 3542.17, -3409.17, 133.978, 0, 0, 0, 0, 100, 0),
+(@PATH, 8, 3534.93, -3390.99, 132.376, 0, 0, 0, 0, 100, 0),
+(@PATH, 9, 3514.6, -3385.83, 132.954, 0, 0, 0, 0, 100, 0),
+(@PATH, 10, 3490.51, -3379.59, 135.276, 0, 0, 0, 0, 100, 0);
+
+-- ghoul 2
+SET @NPC := 53650;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 1, 3540.4, -3368.09, 132.121, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 3542.78, -3361.51, 131.314, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 3549.92, -3341.76, 129.224, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 3560.03, -3335.19, 129.328, 0, 0, 0, 0, 100, 0),
+(@PATH, 5, 3574.02, -3335.48, 128.637, 0, 0, 0, 0, 100, 0),
+(@PATH, 6, 3573.64, -3335.16, 128.678, 0, 0, 0, 0, 100, 0),
+(@PATH, 7, 3555.43, -3333.6, 129.334, 0, 0, 0, 0, 100, 0),
+(@PATH, 8, 3551.14, -3346.93, 129.178, 0, 0, 0, 0, 100, 0),
+(@PATH, 9, 3543.94, -3366.65, 131.755, 0, 0, 0, 0, 100, 0),
+(@PATH, 10, 3538.8, -3383.53, 132.376, 0, 0, 0, 0, 100, 0),
+(@PATH, 11, 3541.21, -3408.97, 133.924, 0, 0, 0, 0, 100, 0),
+(@PATH, 12, 3543.48, -3415.58, 134.695, 0, 0, 0, 0, 100, 0),
+(@PATH, 13, 3544.42, -3415.4, 134.705, 0, 0, 0, 0, 100, 0),
+(@PATH, 14, 3540.17, -3402.06, 133.109, 0, 0, 0, 0, 100, 0),
+(@PATH, 15, 3539.67, -3377.05, 132.376, 0, 0, 0, 0, 100, 0);
+
+-- ghoul 3
+SET @NPC := 53674;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 1, 3522.5, -3323, 131.049, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 3502.3, -3316.38, 130.224, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 3526.88, -3322.32, 130.737, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 3540.5, -3325.57, 129.385, 0, 0, 0, 0, 100, 0),
+(@PATH, 5, 3560.99, -3330.15, 129.396, 0, 0, 0, 0, 100, 0),
+(@PATH, 6, 3584.68, -3334.31, 127.753, 0, 0, 0, 0, 100, 0),
+(@PATH, 7, 3571, -3331.47, 129.071, 0, 0, 0, 0, 100, 0),
+(@PATH, 8, 3557.25, -3328.84, 129.396, 0, 0, 0, 0, 100, 0),
+(@PATH, 9, 3532.13, -3323.54, 130.087, 0, 0, 0, 0, 100, 0);
+
+ -- cadaver emote
+ -- Mangled Cadaver SAI
+SET @ENTRY := 10382;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,3,0,0,30000,30000,11,16143,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mangled Cadaver - In Combat - Cast 'Cadaver Worms' (No Repeat) (Normal Dungeon)"),
+(@ENTRY,0,1,0,6,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mangled Cadaver - On Just Died - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `entry`=10382;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `comment`) VALUES 
+(10382, 0, 0, '%s collapses but the broken body rises again!', 16, 0, 100, 0, 0, 0, 5772, 'Mangled Cadaver');
diff --git a/sql/updates/world/2015_09_11_01_world_from_335.sql b/sql/updates/world/2015_09_11_01_world_from_335.sql
new file mode 100644
index 0000000000..cdfc38b120
--- /dev/null
+++ b/sql/updates/world/2015_09_11_01_world_from_335.sql
@@ -0,0 +1,68 @@
+-- Patchwork Horror 
+-- Pathing for Entry: 53943 'TDB FORMAT'
+SET @NPC := 53953;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x` = 3560.001, `position_y` = -3333.560, `position_z` = 129.3446 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 3560, -3333.56, 129.345),
+(@PATH, 2, 3586.66, -3333.67, 127.532),
+(@PATH, 3, 3547.96, -3350.48, 129.671),
+(@PATH, 4, 3535.26, -3386.41, 132.376),
+(@PATH, 5, 3547.32, -3425.53, 135.592),
+(@PATH, 6, 3535.26, -3386.41, 132.376),
+(@PATH, 7, 3547.96, -3350.48, 129.671),
+(@PATH, 8, 3586.66, -3333.67, 127.532),
+(@PATH, 9, 3560, -3333.56, 129.345),
+(@PATH, 10, 3534.01, -3324.43, 129.798),
+(@PATH, 11, 3514.71, -3316.2, 131.367),
+(@PATH, 12, 3534.01, -3324.43, 129.798);
+
+-- Pathing for Entry: 53943 'TDB FORMAT'
+SET @NPC := 53943;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2, `position_x` = 3658.833, `position_y` = -3494.780, `position_z` = 136.6372 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 3658.83, -3494.78, 136.637),
+(@PATH, 2, 3643.47, -3488.16, 137.328),
+(@PATH, 3, 3627.43, -3493.95, 136.949),
+(@PATH, 4, 3613.32, -3494.96, 136.837),
+(@PATH, 5, 3595.51, -3479.3, 134.85),
+(@PATH, 6, 3611.96, -3502.99, 137.218),
+(@PATH, 7, 3628.52, -3521.97, 136.803),
+(@PATH, 8, 3646.97, -3519.17, 136.667),
+(@PATH, 9, 3657.54, -3512.66, 136.748);
+
+-- Pathing for Entry: 53954 'TDB FORMAT'
+SET @NPC := 53954;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2, `position_x` = 3659.589, `position_y` = -3336.161, `position_z` = 123.8126 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(@PATH, 1, 3659.59, -3336.16, 123.813),
+(@PATH, 2, 3676.39, -3362, 126.91),
+(@PATH, 3, 3684.48, -3376.63, 129.534),
+(@PATH, 4, 3692.16, -3390.77, 131.803),
+(@PATH, 5, 3704.82, -3409.99, 132.136),
+(@PATH, 6, 3707.44, -3415.75, 131.862),
+(@PATH, 7, 3713.12, -3429.09, 131.052),
+(@PATH, 8, 3707.44, -3415.75, 131.862),
+(@PATH, 9, 3704.82, -3409.99, 132.136),
+(@PATH, 10, 3692.16, -3390.77, 131.803),
+(@PATH, 11, 3684.48, -3376.63, 129.534),
+(@PATH, 12, 3676.56, -3362.26, 126.988),
+(@PATH, 13, 3659.59, -3336.16, 123.813),
+(@PATH, 14, 3676.38, -3308.39, 126.575),
+(@PATH, 15, 3684.71, -3277.38, 127.788),
+(@PATH, 16, 3710.36, -3258.23, 127.414),
+(@PATH, 17, 3684.71, -3277.38, 127.788),
+(@PATH, 18, 3676.38, -3308.39, 126.575);
+
+UPDATE `creature_template` SET `speed_walk` = 1 WHERE `Entry` = 10414;
diff --git a/sql/updates/world/2015_09_11_02_world_from_335.sql b/sql/updates/world/2015_09_11_02_world_from_335.sql
new file mode 100644
index 0000000000..e2863aea0f
--- /dev/null
+++ b/sql/updates/world/2015_09_11_02_world_from_335.sql
@@ -0,0 +1,204 @@
+-- Stratholme - Hall of Light
+-- 1.
+SET @NPC := 54085;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3616.438,`position_y`=-3097.423,`position_z`=134.3719 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3616.438,`position_y`=-3097.423,`position_z`=134.3719 WHERE `guid`=54071;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3616.438,-3097.423,134.3719,0,0,0,0,100,0),
+(@PATH,2,3614.938,-3098.173,134.3719,0,0,0,0,100,0),
+(@PATH,3,3612.438,-3099.173,134.3719,0,0,0,0,100,0),
+(@PATH,4,3606.938,-3101.423,134.3719,0,0,0,0,100,0),
+(@PATH,5,3606.734,-3101.405,134.6407,0,0,0,0,100,0),
+(@PATH,6,3604.484,-3102.155,134.6407,0,0,0,0,100,0),
+(@PATH,7,3600.234,-3096.655,134.6407,0,0,0,0,100,0),
+(@PATH,8,3598.984,-3095.155,135.8907,0,0,0,0,100,0),
+(@PATH,9,3598.234,-3094.155,135.8907,0,0,0,0,100,0),
+(@PATH,10,3595.816,-3091.076,135.9108,0,0,0,0,100,0),
+(@PATH,11,3587.79,-3079.112,135.9129,0,0,0,0,100,0),
+(@PATH,12,3587.842,-3079.453,135.662,0,0,0,0,100,0),
+(@PATH,13,3588.163,-3079.576,135.9112,0,0,0,0,100,0),
+(@PATH,14,3596.181,-3091.539,135.891,0,0,0,0,100,0),
+(@PATH,15,3598.431,-3094.289,135.891,0,0,0,0,100,0),
+(@PATH,16,3598.931,-3095.039,135.891,0,0,0,0,100,0),
+(@PATH,17,3599.931,-3096.539,134.891,0,0,0,0,100,0),
+(@PATH,18,3604.416,-3102.23,134.1847,0,0,0,0,100,0),
+(@PATH,19,3606.416,-3101.48,134.1847,0,0,0,0,100,0),
+(@PATH,20,3612.416,-3098.98,134.1847,0,0,0,0,100,0),
+(@PATH,21,3614.166,-3098.23,134.1847,0,0,0,0,100,0),
+(@PATH,22,3614.522,-3098.114,134.3642,0,0,0,0,100,0),
+(@PATH,23,3616.772,-3097.114,134.3642,0,0,0,0,100,0),
+(@PATH,24,3621.522,-3093.864,134.3642,0,0,0,0,100,0),
+(@PATH,25,3623.522,-3092.114,134.3642,0,0,0,0,100,0),
+(@PATH,26,3632.772,-3086.114,134.3642,0,0,0,0,100,0),
+(@PATH,27,3633.048,-3085.9,134.3664,0,0,0,0,100,0),
+(@PATH,28,3634.048,-3085.4,134.3664,0,0,0,0,100,0),
+(@PATH,29,3636.548,-3083.65,134.3664,0,0,0,0,100,0),
+(@PATH,30,3638.048,-3082.9,134.3664,0,0,0,0,100,0),
+(@PATH,31,3639.548,-3081.9,134.3664,0,0,0,0,100,0),
+(@PATH,32,3639.528,-3081.807,134.366,0,0,0,0,100,0),
+(@PATH,33,3638.028,-3082.807,134.366,0,0,0,0,100,0),
+(@PATH,34,3636.778,-3083.557,134.366,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=54085;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(54085, 54085, 0, 0, 2, 0, 0),
+(54085, 54071, 3, 0, 2, 0, 0);
+
+-- 2.
+SET @NPC := 52141;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3535.722,`position_y`=-3057.91,`position_z`=135.3322 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3535.722,`position_y`=-3057.91,`position_z`=135.3322 WHERE `guid`=54169;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3535.722,-3057.91,135.3322,0,0,0,0,100,0),
+(@PATH,2,3540.984,-3066.577,135.6673,0,0,0,0,100,0),
+(@PATH,3,3537.299,-3060.883,135.6673,0,0,0,0,100,0),
+(@PATH,4,3535.783,-3058.649,135.6673,0,0,0,0,100,0),
+(@PATH,5,3535.532,-3058.017,135.5822,0,0,0,0,100,0),
+(@PATH,6,3533.794,-3055.673,134.997,0,0,0,0,100,0),
+(@PATH,7,3529.241,-3048.929,134.997,0,0,0,0,100,0),
+(@PATH,8,3530.385,-3053.843,134.997,0,0,0,0,100,0),
+(@PATH,9,3529.099,-3054.688,135.247,0,0,0,0,100,0),
+(@PATH,10,3524.849,-3056.438,135.247,0,0,0,0,100,0),
+(@PATH,11,3524.898,-3057.071,135.247,0,0,0,0,100,0),
+(@PATH,12,3517.685,-3062.228,134.997,0,0,0,0,100,0),
+(@PATH,13,3515.195,-3063.973,134.997,0,0,0,0,100,0),
+(@PATH,14,3517.849,-3062.096,134.997,0,0,0,0,100,0),
+(@PATH,15,3512.628,-3065.658,135.247,0,0,0,0,100,0),
+(@PATH,16,3512.88,-3065.546,134.997,0,0,0,0,100,0),
+(@PATH,17,3512.397,-3065.865,135.247,0,0,0,0,100,0),
+(@PATH,18,3507.873,-3069.02,134.997,0,0,0,0,100,0),
+(@PATH,19,3501.293,-3073.773,134.997,0,0,0,0,100,0),
+(@PATH,20,3502.973,-3072.586,134.997,0,0,0,0,100,0),
+(@PATH,21,3500.175,-3074.654,135.247,0,0,0,0,100,0),
+(@PATH,22,3498.175,-3076.154,135.247,0,0,0,0,100,0),
+(@PATH,23,3498.078,-3076.195,134.997,0,0,0,0,100,0),
+(@PATH,24,3497.885,-3076.195,135.247,0,0,0,0,100,0),
+(@PATH,25,3496.635,-3077.195,135.247,0,0,0,0,100,0),
+(@PATH,26,3498.074,-3076.204,134.997,0,0,0,0,100,0),
+(@PATH,27,3500.452,-3074.542,135.247,0,0,0,0,100,0),
+(@PATH,28,3503.016,-3072.576,134.997,0,0,0,0,100,0),
+(@PATH,29,3509.555,-3067.772,134.997,0,0,0,0,100,0),
+(@PATH,30,3507.929,-3069.026,134.997,0,0,0,0,100,0),
+(@PATH,31,3512.387,-3065.935,135.247,0,0,0,0,100,0),
+(@PATH,32,3512.517,-3065.823,135.247,0,0,0,0,100,0),
+(@PATH,33,3519.535,-3060.917,134.997,0,0,0,0,100,0),
+(@PATH,34,3517.873,-3062.076,134.997,0,0,0,0,100,0),
+(@PATH,35,3524.547,-3057.446,134.997,0,0,0,0,100,0),
+(@PATH,36,3522.894,-3058.655,134.997,0,0,0,0,100,0),
+(@PATH,37,3525.393,-3056.905,135.247,0,0,0,0,100,0),
+(@PATH,38,3528.643,-3054.905,135.247,0,0,0,0,100,0),
+(@PATH,39,3527.923,-3055.323,134.997,0,0,0,0,100,0),
+(@PATH,40,3528.969,-3054.581,135.247,0,0,0,0,100,0),
+(@PATH,41,3532.499,-3054.48,134.997,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=52141;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(52141, 52141, 0, 0, 2, 0, 0),
+(52141, 54169, 3, 0, 2, 0, 0);
+
+-- 3.
+SET @NPC := 52144;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3443.406,`position_y`=-3083.562,`position_z`=135.0021 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3443.406,`position_y`=-3083.562,`position_z`=135.0021 WHERE `guid`=54170;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3443.406,-3083.562,135.0021,0,0,0,0,100,0),
+(@PATH,2,3438.447,-3078.663,135.5136,0,0,0,0,100,0),
+(@PATH,3,3438.595,-3078.601,135.0019,0,0,0,0,100,0),
+(@PATH,4,3442.701,-3082.71,135.0021,0,0,0,0,100,0),
+(@PATH,5,3444.575,-3084.654,135.0022,0,0,0,0,100,0),
+(@PATH,6,3445.956,-3083.634,135.0022,0,0,0,0,100,0),
+(@PATH,7,3446.778,-3083.367,135.2478,0,0,0,0,100,0),
+(@PATH,8,3449.778,-3082.867,135.2478,0,0,0,0,100,0),
+(@PATH,9,3449.807,-3082.485,135.2462,0,0,0,0,100,0),
+(@PATH,10,3457.698,-3077.302,134.9976,0,0,0,0,100,0),
+(@PATH,11,3455.978,-3078.373,134.9957,0,0,0,0,100,0),
+(@PATH,12,3458.637,-3076.211,135.2484,0,0,0,0,100,0),
+(@PATH,13,3460.387,-3075.211,135.2484,0,0,0,0,100,0),
+(@PATH,14,3460.28,-3075.071,135.2505,0,0,0,0,100,0),
+(@PATH,15,3465.067,-3071.659,135.2512,0,0,0,0,100,0),
+(@PATH,16,3465.241,-3071.764,135.2516,0,0,0,0,100,0),
+(@PATH,17,3472.513,-3066.586,135.0025,0,0,0,0,100,0),
+(@PATH,18,3470.79,-3067.797,135.0025,0,0,0,0,100,0),
+(@PATH,19,3474.771,-3064.983,135.2522,0,0,0,0,100,0),
+(@PATH,20,3474.693,-3065.094,135.2523,0,0,0,0,100,0),
+(@PATH,21,3482.48,-3059.7,135.0017,0,0,0,0,100,0),
+(@PATH,22,3480.787,-3060.873,135.0018,0,0,0,0,100,0),
+(@PATH,23,3478.327,-3062.577,135.002,0,0,0,0,100,0),
+(@PATH,24,3476.108,-3064.115,135.0021,0,0,0,0,100,0),
+(@PATH,25,3475.113,-3064.708,135.2523,0,0,0,0,100,0),
+(@PATH,26,3472.919,-3066.325,135.0025,0,0,0,0,100,0),
+(@PATH,27,3471.327,-3067.427,135.0025,0,0,0,0,100,0),
+(@PATH,28,3465.504,-3071.557,135.2518,0,0,0,0,100,0),
+(@PATH,29,3466.285,-3070.921,135.0025,0,0,0,0,100,0),
+(@PATH,30,3465.06,-3071.76,135.2514,0,0,0,0,100,0),
+(@PATH,31,3460.56,-3074.76,135.2514,0,0,0,0,100,0),
+(@PATH,32,3461.687,-3074.164,135.0022,0,0,0,0,100,0),
+(@PATH,33,3460.227,-3075.276,135.2483,0,0,0,0,100,0),
+(@PATH,34,3458.727,-3076.276,135.2483,0,0,0,0,100,0),
+(@PATH,35,3456.701,-3077.72,134.9965,0,0,0,0,100,0),
+(@PATH,36,3450.072,-3082.449,134.9891,0,0,0,0,100,0),
+(@PATH,37,3451.695,-3081.291,134.9909,0,0,0,0,100,0),
+(@PATH,38,3449.717,-3082.664,135.247,0,0,0,0,100,0),
+(@PATH,39,3447.467,-3084.164,135.247,0,0,0,0,100,0),
+(@PATH,40,3447.448,-3084.141,135.2488,0,0,0,0,100,0),
+(@PATH,41,3445.289,-3083.674,135.0022,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=52144;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(52144, 52144, 0, 0, 2, 0, 0),
+(52144, 54170, 3, 0, 2, 0, 0);
+
+-- 4.
+SET @NPC := 54205;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3581.3,`position_y`=-2994.275,`position_z`=125.25 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3581.3,-2994.275,125.25,0,0,0,0,100,0),
+(@PATH,2,3582.05,-2995.275,125.25,0,0,0,0,100,0),
+(@PATH,3,3581.05,-2995.775,125.25,0,0,0,0,100,0),
+(@PATH,4,3575.3,-2999.775,125.25,0,0,0,0,100,0),
+(@PATH,5,3573.05,-3001.275,125.25,0,0,0,0,100,0),
+(@PATH,6,3571.8,-3002.025,125.25,0,0,0,0,100,0),
+(@PATH,7,3569.3,-3004.025,125.25,0,0,0,0,100,0),
+(@PATH,8,3565.3,-3006.775,125.25,0,0,0,0,100,0),
+(@PATH,9,3562.695,-3008.538,125.2498,0,0,0,0,100,0),
+(@PATH,10,3555.445,-3014.038,125.2498,0,0,0,0,100,0),
+(@PATH,11,3553.945,-3015.288,125.2498,0,0,0,0,100,0),
+(@PATH,12,3551.945,-3016.788,125.2498,0,0,0,0,100,0),
+(@PATH,13,3546.965,-3020.639,125.3795,0,0,0,0,100,0),
+(@PATH,14,3550.465,-3026.139,125.3795,0,0,0,0,100,0),
+(@PATH,15,3550.965,-3027.139,125.3795,0,0,0,0,100,0),
+(@PATH,16,3552.215,-3028.389,125.3795,0,0,0,0,100,0),
+(@PATH,17,3552.715,-3029.889,125.3795,0,0,0,0,100,0),
+(@PATH,18,3553.965,-3031.639,126.1295,0,0,0,0,100,0),
+(@PATH,19,3553.932,-3031.731,126.1293,0,0,0,0,100,0),
+(@PATH,20,3552.932,-3029.731,125.3793,0,0,0,0,100,0),
+(@PATH,21,3552.182,-3028.981,125.3793,0,0,0,0,100,0),
+(@PATH,22,3551.182,-3026.981,125.3793,0,0,0,0,100,0),
+(@PATH,23,3550.432,-3025.981,125.3793,0,0,0,0,100,0),
+(@PATH,24,3546.863,-3020.401,125.2494,0,0,0,0,100,0),
+(@PATH,25,3551.863,-3016.651,125.2494,0,0,0,0,100,0),
+(@PATH,26,3553.863,-3015.401,125.2494,0,0,0,0,100,0),
+(@PATH,27,3555.363,-3014.151,125.2494,0,0,0,0,100,0),
+(@PATH,28,3562.876,-3008.442,125.2495,0,0,0,0,100,0),
+(@PATH,29,3565.126,-3006.692,125.2495,0,0,0,0,100,0),
+(@PATH,30,3569.376,-3003.942,125.2495,0,0,0,0,100,0),
+(@PATH,31,3571.876,-3002.192,125.2495,0,0,0,0,100,0),
+(@PATH,32,3573.126,-3001.442,125.2495,0,0,0,0,100,0),
+(@PATH,33,3575.376,-2999.942,125.2495,0,0,0,0,100,0),
+(@PATH,34,3581.126,-2995.942,125.2495,0,0,0,0,100,0);
diff --git a/sql/updates/world/2015_09_11_03_world_from_335.sql b/sql/updates/world/2015_09_11_03_world_from_335.sql
new file mode 100644
index 0000000000..364124850c
--- /dev/null
+++ b/sql/updates/world/2015_09_11_03_world_from_335.sql
@@ -0,0 +1,104 @@
+-- Stratholme - The Gauntlet
+-- 1. Ghoul
+SET @NPC := 53675;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 1, 3711.96, -3428.02, 131.083, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 3715.35, -3439.06, 129.468, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 3719.55, -3452.41, 129.604, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 3723.87, -3470.47, 129.838, 0, 0, 0, 0, 100, 0),
+(@PATH, 5, 3711.6, -3485.74, 129.702, 0, 0, 0, 0, 100, 0),
+(@PATH, 6, 3696.91, -3487.86, 131.216, 0, 0, 0, 0, 100, 0),
+(@PATH, 7, 3675.95, -3489.1, 135.379, 0, 0, 0, 0, 100, 0),
+(@PATH, 8, 3650.84, -3490.4, 136.889, 0, 0, 0, 0, 100, 0),
+(@PATH, 9, 3664.74, -3488.84, 136.633, 0, 0, 0, 0, 100, 0),
+(@PATH, 10, 3692.63, -3486.4, 132.018, 0, 0, 0, 0, 100, 0),
+(@PATH, 11, 3713.54, -3482.02, 129.701, 0, 0, 0, 0, 100, 0),
+(@PATH, 12, 3719.24, -3466.01, 129.741, 0, 0, 0, 0, 100, 0),
+(@PATH, 13, 3717.94, -3444.6, 129.36, 0, 0, 0, 0, 100, 0),
+(@PATH, 14, 3716.43, -3439.47, 129.393, 0, 0, 0, 0, 100, 0);
+-- 2 . ghoul
+SET @NPC := 53601;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 1, 3590.12, -3472.24, 135.046, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 3605.83, -3487.43, 135.938, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 3615.36, -3497.68, 137.061, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 3627.56, -3514.74, 136.693, 0, 0, 0, 0, 100, 0),
+(@PATH, 5, 3638.86, -3523.51, 136.974, 0, 0, 0, 0, 100, 0),
+(@PATH, 6, 3654.2, -3517.46, 136.842, 0, 0, 0, 0, 100, 0),
+(@PATH, 7, 3661.21, -3505.25, 136.721, 0, 0, 0, 0, 100, 0),
+(@PATH, 8, 3655.99, -3491.83, 136.798, 0, 0, 0, 0, 100, 0),
+(@PATH, 9, 3640.93, -3487.52, 137.452, 0, 0, 0, 0, 100, 0),
+(@PATH, 10, 3631.02, -3489.32, 137.395, 0, 0, 0, 0, 100, 0),
+(@PATH, 11, 3613.42, -3495.94, 136.891, 0, 0, 0, 0, 100, 0),
+(@PATH, 12, 3601.41, -3489.18, 135.84, 0, 0, 0, 0, 100, 0);
+
+-- texts
+-- Undead Postman SAI
+SET @ENTRY := 11142;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,49,0,0,0,0,0,0,21,40,0,0,0,0,0,0,"Undead Postman - On Just Summoned - Start Attacking"),
+(@ENTRY,0,1,0,0,0,50,0,0,1000,20000,30000,11,5137,64,0,0,0,0,2,0,0,0,0,0,0,0,"Undead Postman - In Combat - Cast 'Call of the Grave'"),
+(@ENTRY,0,2,0,0,0,75,0,3000,4000,8000,9000,11,7713,64,0,0,0,0,2,0,0,0,0,0,0,0,"Undead Postman - In Combat - Cast 'Wailing Dead'"),
+(@ENTRY,0,3,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Undead Postman - On Aggro - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `entry`=11142;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `comment`) VALUES 
+(11142, 0, 0, 'No tampering with the mail!', 12, 0, 100, 0, 0, 0, 6470, 'Undead Postman');
+
+-- enable flying
+UPDATE `creature_template` SET `InhabitType`=4 WHERE  `entry`=10408;
+-- ghoul
+SET @NPC := 53696;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 1, 3874.56, -3680.21, 142.696, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 3888.33, -3677.68, 141.623, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 3910.54, -3669.96, 138.655, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 3927.9, -3660.86, 139.4, 0, 0, 0, 0, 100, 0),
+(@PATH, 5, 3937.1, -3653.54, 140.085, 0, 0, 0, 0, 100, 0),
+(@PATH, 6, 3951.33, -3644.09, 135.489, 0, 0, 0, 0, 100, 0),
+(@PATH, 7, 3966.27, -3637.04, 132.434, 0, 0, 0, 0, 100, 0),
+(@PATH, 8, 3981.49, -3626.32, 130.01, 0, 0, 0, 0, 100, 0),
+(@PATH, 9, 3994.5, -3616.13, 129.41, 0, 0, 0, 0, 100, 0),
+(@PATH, 10, 3984.25, -3625.25, 130.021, 0, 0, 0, 0, 100, 0),
+(@PATH, 11, 3972.75, -3635.49, 131.203, 0, 0, 0, 0, 100, 0),
+(@PATH, 12, 3956.89, -3644.66, 134.041, 0, 0, 0, 0, 100, 0),
+(@PATH, 13, 3941.59, -3650.12, 139.218, 0, 0, 0, 0, 100, 0),
+(@PATH, 14, 3930.15, -3658.18, 139.569, 0, 0, 0, 0, 100, 0),
+(@PATH, 15, 3918.7, -3666.25, 137.71, 0, 0, 0, 0, 100, 0),
+(@PATH, 16, 3902.74, -3674.09, 139.385, 0, 0, 0, 0, 100, 0),
+(@PATH, 17, 3896.26, -3676.72, 140.59, 0, 0, 0, 0, 100, 0);
+
+-- Plague Ghoul SAI
+SET @ENTRY := 10405;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,4,0,1,0,100,0,3000,5000,8000,12000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Plague Ghoul - Out of Combat - Play Emote 1");
+
+-- Ghoul Ravener SAI
+SET @ENTRY := 10406;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=2;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,2,0,1,0,100,0,3000,5000,8000,12000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ghoul Ravener - Out of Combat - Play Emote 1");
+
+-- Fleshflayer Ghoul SAI
+SET @ENTRY := 10407;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=2;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,2,0,1,0,100,0,3000,5000,8000,12000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Fleshflayer Ghoul - Out of Combat - Play Emote 1");
diff --git a/sql/updates/world/2015_09_11_04_world_from_335.sql b/sql/updates/world/2015_09_11_04_world_from_335.sql
new file mode 100644
index 0000000000..abf0cb0ab2
--- /dev/null
+++ b/sql/updates/world/2015_09_11_04_world_from_335.sql
@@ -0,0 +1,113 @@
+-- 
+SET @QUEST              := 13343; -- Mystery of the Infinite 2 (13343)
+SET @NPC_HoE            := 32327; -- Hourglass of Eternity
+SET @NPC_PU             := 32331; -- Past You
+SET @SPELL_SUMMON_PU    := 60790; -- Mystery of the Infinite: Force Cast to Player of Summon Past You
+SET @SPELL_MIRROR       := 49889; -- Mystery of the Infinite: Future You's Mirror Image Aura
+SET @SPELL_NEARBY       := 50867; -- Hourglass of Eternity Nearby
+SET @AURA_VISUAL        := 50057; -- Mystery of the Infinite: Hourglass of Eternity Visual/Sound Aura
+SET @SPELL_ASSAILANT    := 49900; -- Summon Infinite Assailant
+SET @SPELL_DESTROYER    := 49901; -- Summon Infinite Destroyer
+SET @SPELL_MAGUS        := 49902; -- Summon Infinite Chrono-Magus
+SET @SPELL_TIMERENDER   := 60887; -- Summon Infinite Timerender
+SET @NPC_IT             := 32352; -- Infinite Timerender
+
+-- Infinite Timerender
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@NPC_IT;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@NPC_IT;
+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
+(@NPC_IT,0,0,0,0,0,100,0,5000,6000,12000,17000,11,51020,0,0,0,0,0,2,0,0,0,0,0,0,0,'Infinite Timerender - IC - Cast Time Lapse'),
+(@NPC_IT,0,1,0,6,0,100,0,0,0,0,0,45,2,1,0,0,0,0,19,@NPC_HoE,20,0,0,0,0,0,'Infinite Timerender - On Death - Set Data on HoE');
+
+UPDATE `spell_area` SET `quest_start_status`=66, `quest_end_status`=0 WHERE `spell`=50012 AND `area`=4175;
+
+-- Hourglass of Eternity
+UPDATE `creature_template` SET `AIName`='SmartAI',`RegenHealth`=0 WHERE `entry`=@NPC_HoE;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@NPC_HoE AND `source_type`=0) OR (`entryorguid`IN (@NPC_HoE*100,@NPC_HoE*100+1) AND `source_type`=9);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@NPC_HoE,0,0,1,54,0,100,1,0,0,0,0,85,@SPELL_SUMMON_PU,0,0,0,0,0,7,0,0,0,0,0,0,0,'Hourglass of Eternity - On spawn - Invoker Cast'),
+(@NPC_HoE,0,1,2,61,0,100,0,0,0,0,0,11,@SPELL_NEARBY,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On link - Cast Spell'),
+(@NPC_HoE,0,2,3,61,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - Set passive - Self'),
+(@NPC_HoE,0,3,6,61,0,100,0,0,0,0,0,80,@NPC_HoE*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On link - Start timed script'),
+(@NPC_HoE,0,4,0,6,0,100,0,0,0,0,0,6,@QUEST,0,0,0,0,0,16,0,0,0,0,0,0,0,'Hourglass of Eternity - On Death - Fail Quest'),
+(@NPC_HoE,0,5,0,38,0,100,0,2,1,0,0,80,@NPC_HoE*100+1,2,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On Data Set  - Start timed script two'),
+(@NPC_HoE,0,6,0,61,0,100,0,0,0,0,0,11,@AURA_VISUAL,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On link - Cast Spell'),
+(@NPC_HoE,0,7,0,54,0,100,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,'Hourglass of Eternity - On spawn - Store target'),
+
+-- Wave 1 
+(@NPC_HoE*100,9,0,0,0,0,100,1,3000,3000,0,0,45,1,1,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,1,0,0,0,100,1,5000,5000,0,0,45,1,2,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,2,0,0,0,100,1,5000,5000,0,0,11,@SPELL_MAGUS,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+(@NPC_HoE*100,9,3,0,0,0,100,1,0,0,0,0,11,@SPELL_ASSAILANT,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+-- Wave 2 
+(@NPC_HoE*100,9,4,0,0,0,100,1,5000,5000,0,0,45,1,3,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,5,0,0,0,100,1,6000,6000,0,0,45,1,4,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,6,0,0,0,100,1,19000,19000,0,0,11,@SPELL_MAGUS,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+(@NPC_HoE*100,9,7,0,0,0,100,1,0,0,0,0,11,@SPELL_MAGUS,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+-- Wave 3 
+(@NPC_HoE*100,9,8,0,0,0,100,1,5000,5000,0,0,45,1,5,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,9,0,0,0,100,1,6000,6000,0,0,45,1,6,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,10,0,0,0,100,1,5000,5000,0,0,45,1,7,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,11,0,0,0,100,1,14000,14000,0,0,11,@SPELL_MAGUS,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+(@NPC_HoE*100,9,12,0,0,0,100,1,0,0,0,0,11,@SPELL_ASSAILANT,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+(@NPC_HoE*100,9,13,0,0,0,100,1,0,0,0,0,11,@SPELL_DESTROYER,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+-- Wave 4 
+(@NPC_HoE*100,9,14,0,0,0,100,1,5000,5000,0,0,45,1,8,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,15,0,0,0,100,1,9000,9000,0,0,45,1,9,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,16,0,0,0,100,1,7000,7000,0,0,45,1,10,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,17,0,0,0,100,1,9000,9000,0,0,11,@SPELL_MAGUS,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100,9,18,0,0,0,100,1,0,0,0,0,11,@SPELL_ASSAILANT,0,0,0,0,0,1,0,0,0,0,0,0,0,'OHourglass of Eternity - On update - Cast Spell on self'),
+(@NPC_HoE*100,9,19,0,0,0,100,1,0,0,0,0,11,@SPELL_DESTROYER,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+-- Wave 5 final 
+(@NPC_HoE*100,9,20,0,0,0,100,1,23000,23000,0,0,11,@SPELL_TIMERENDER,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update - Cast Spell on self'),
+-- End Text Script
+(@NPC_HoE*100+1,9,0,0,0,0,100,1,4000,4000,0,0,45,2,1,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100+1,9,1,0,0,0,100,1,0,0,0,0,15,@QUEST,0,0,0,0,0,12,1,0,0,0,0,0,0,'Hourglass of Eternity - On update - Give Quest Credit'),
+(@NPC_HoE*100+1,9,2,0,0,0,100,1,8000,8000,0,0,45,2,2,0,0,0,0,19,@NPC_PU,20,0,0,0,0,0,'Hourglass of Eternity - On update - Set Data on Past You'),
+(@NPC_HoE*100+1,9,3,0,0,0,100,1,4000,4000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hourglass of Eternity - On update -Despawn after timer');
+
+-- Past You
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC_PU AND `source_type`=0;
+UPDATE `creature_template` SET `faction`=2141,`AIName`='SmartAI',`unit_flags`=0,`RegenHealth`=0, `minlevel`=75, `maxlevel`=75 WHERE `entry`=@NPC_PU;
+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
+(@NPC_PU,0,0,1,54,0,100,1,0,0,0,0,85,@SPELL_MIRROR,2,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On spawn - Invoker Cast Spell - Self'),
+(@NPC_PU,0,1,0,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,11,@NPC_HoE,10,0,0,0,0,0,'Past You - On link - Set Orientation'),
+(@NPC_PU,0,2,0,38,0,100,0,1,1,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 1'),
+(@NPC_PU,0,3,0,38,0,100,0,1,2,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 2'),
+(@NPC_PU,0,4,0,38,0,100,0,1,3,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 3'),
+(@NPC_PU,0,5,0,38,0,100,0,1,4,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 4'),
+(@NPC_PU,0,6,0,38,0,100,0,1,5,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 5'),
+(@NPC_PU,0,7,0,38,0,100,0,1,6,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 6'),
+(@NPC_PU,0,8,0,38,0,100,0,1,7,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 7'),
+(@NPC_PU,0,9,0,38,0,100,0,1,8,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 8'),
+(@NPC_PU,0,10,0,38,0,100,0,1,9,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 9'),
+(@NPC_PU,0,11,0,38,0,100,0,1,10,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 10'),
+(@NPC_PU,0,12,0,38,0,100,0,2,1,0,0,1,11,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Data set - Whisper 11'),
+(@NPC_PU,0,13,14,38,0,100,0,2,2,0,0,1,12,0,0,0,0,0,1,0,0,0,0.0,0.0,0.0,0.0,'Future You - On Data Set - Whisper 12'),
+(@NPC_PU,0,14,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Link - Despawn after timer'),
+(@NPC_PU,0,15,16,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Past You - On Evade - Despawn after timer'),
+(@NPC_PU,0,16,0,61,0,100,0,0,0,0,0,85,@SPELL_SUMMON_PU,0,0,0,0,0,7,0,0,0,0,0,0,0,'Past You - On Link - Cast Summon Clone');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_MIRROR AND `ConditionValue2`=@NPC_PU;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,7,@SPELL_MIRROR,0,1,31,0,3,@NPC_PU,0,0,0,'','Spell target Past You');
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (@NPC_PU);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_PU,0,0x0,0x1,'');
+
+-- Past You's text
+DELETE FROM `creature_text` WHERE `entry`=@NPC_PU;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`, `BroadcastTextId`) VALUES
+(@NPC_PU,1,0,'Whoa! You''re me, but from the future! Hey, my equipment got an upgrade! Cool!',15,0,100,396,0,0,'Past You', 32764), 
+(@NPC_PU,2,0,'Here come the Infinites! I''ve got to keep the hourglass safe. Can you help?',15,0,100,396,0,0,'Past You', 32769), 
+(@NPC_PU,3,0,'This equipment looks cool and all, but couldn''t we have done a little better? Are you even raiding?',15,0,100,396,0,0,'Past You', 32770), 
+(@NPC_PU,4,0,'So, how does it all turn out in Icecrown?',15,0,100,396,0,0,'Past You', 32771),
+(@NPC_PU,5,0,'It might help if you could tell me how many of these guys we''re going to fight.  You can remember that, right, grandpa?',15,0,100,396,0,0,'Past You', 32775),
+(@NPC_PU,6,0,'Chromie said that if I don''t do this just right, I might wink out of existence. If I go, then you go!',15,0,100,396,0,0,'Past You', 32772), 
+(@NPC_PU,7,0,'I just want you to know that if we get through this alive, I''m making sure that we turn out better than you. No offense.',15,0,100,396,0,0,'Past You', 32776), 
+(@NPC_PU,8,0,'Looks like I''m an underachiever.',15,0,100,396,0,0,'Past You', 32773), 
+(@NPC_PU,9,0,'Wait a minute! If you''re here, then that means that in the not-so-distant future I''m going to be you helping me? Are we stuck in a time loop?!',15,0,100,396,0,0,'Past You', 32777), 
+(@NPC_PU,10,0,'I think I''m going to turn to drinking after this.',15,0,100,396,0,0,'Past You', 32774), 
+(@NPC_PU,11,0,'What the heck? Nozdormu is up there!',15,0,100,396,0,0,'Past You', 32781), 
+(@NPC_PU,12,0,'I feel like I''m being pulled away through time. Thanks for the help....',15,0,100,396,0,0,'Past You', 32782);
diff --git a/sql/updates/world/2015_09_11_05_world_from_335.sql b/sql/updates/world/2015_09_11_05_world_from_335.sql
new file mode 100644
index 0000000000..05192c5a98
--- /dev/null
+++ b/sql/updates/world/2015_09_11_05_world_from_335.sql
@@ -0,0 +1,3 @@
+DELETE FROM `reference_loot_template` WHERE `Entry`=10018 AND `Item`=54469;
+INSERT INTO `reference_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES 
+(10018, 54469, 0, 5, 0, 1, 3, 1, 1, NULL);
diff --git a/sql/updates/world/2015_09_11_06_world_from_335.sql b/sql/updates/world/2015_09_11_06_world_from_335.sql
new file mode 100644
index 0000000000..794e03cd0d
--- /dev/null
+++ b/sql/updates/world/2015_09_11_06_world_from_335.sql
@@ -0,0 +1,2 @@
+DELETE FROM `command` WHERE `name` = 'debug loadcells';
+INSERT INTO `command` (`name`, `permission`, `help`) VALUES ('debug loadcells', 835, 'Syntax: .debug loadcells [mapId]\nLoads all cells for debugging purposes');
diff --git a/sql/updates/world/2015_09_11_07_world_from_335.sql b/sql/updates/world/2015_09_11_07_world_from_335.sql
new file mode 100644
index 0000000000..8ce0d65824
--- /dev/null
+++ b/sql/updates/world/2015_09_11_07_world_from_335.sql
@@ -0,0 +1,10 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` = 35941 AND `ScriptName` = 'spell_kael_gravity_lapse';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (35941, 'spell_kael_gravity_lapse');
+
+UPDATE `gameobject_template` SET `flags` = `flags`|33 WHERE `entry` = 184069;
+
+UPDATE `creature` SET `spawntimesecs` = 604800 WHERE `guid` IN (12567, 12568, 12569, 12570);
+
+DELETE FROM `creature_text` WHERE `entry` = 19622 AND `groupid` = 14;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(19622, 14, 0, '%s begins to cast Pyroblast!', 41, 0, 100, 0, 0, 0, 20775, 0, 'kaelthas EMOTE_PYROBLAST');
diff --git a/sql/updates/world/2015_09_11_08_world_from_335.sql b/sql/updates/world/2015_09_11_08_world_from_335.sql
new file mode 100644
index 0000000000..1dbdab1278
--- /dev/null
+++ b/sql/updates/world/2015_09_11_08_world_from_335.sql
@@ -0,0 +1,157 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=58694;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_cyanigosa_arcane_vacuum',
+'spell_ichoron_splatter',
+'spell_ichoron_protective_bubble',
+'spell_ichoron_drained',
+'spell_ichoron_merge',
+'spell_moragg_ray',
+'spell_moragg_ray_of_pain',
+'spell_moragg_ray_of_suffering',
+'spell_xevozz_summon_ethereal_sphere',
+'spell_violet_hold_destroy_door_seal',
+'spell_violet_hold_portal_periodic',
+'spell_violet_hold_teleport_player',
+'spell_crystal_activation'
+);
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) values
+(58694,'spell_cyanigosa_arcane_vacuum'),
+(54259,'spell_ichoron_splatter'),
+(54306,'spell_ichoron_protective_bubble'),
+(59820,'spell_ichoron_drained'),
+(54269,'spell_ichoron_merge'),
+(54438,'spell_moragg_ray'),
+(54442,'spell_moragg_ray'),
+(59523,'spell_moragg_ray'),
+(59524,'spell_moragg_ray'),
+(58040,'spell_violet_hold_destroy_door_seal'),
+(58008,'spell_violet_hold_portal_periodic'),
+(62138,'spell_violet_hold_teleport_player');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 and `SourceEntry` IN (57912, 57930, 58152, 54258, 54264, 54265, 54266, 54267, 54269);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,57912,0,0,31,0,3,29425,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,57930,0,0,31,0,3,30857,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,0,31,0,3,30661,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,1,31,0,3,30662,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,2,31,0,3,30663,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,3,31,0,3,30664,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,4,31,0,3,30665,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,5,31,0,3,30666,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,6,31,0,3,30667,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,7,31,0,3,30668,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,8,31,0,3,30918,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,9,31,0,3,30961,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,10,31,0,3,30962,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,11,31,0,3,30963,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,12,31,0,3,31007,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,13,31,0,3,31008,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,14,31,0,3,31009,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,15,31,0,3,31010,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,16,31,0,3,31118,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,58152,0,17,31,0,3,32191,0,0,0,0,'','Defense System - Arcane Lightning'),
+(13,1,54258,0,0,31,0,3,29326,102906,0,0,0,'','Ichoron - Water Globule'),
+(13,1,54264,0,0,31,0,3,29326,102905,0,0,0,'','Ichoron - Water Globule'),
+(13,1,54265,0,0,31,0,3,29326,102904,0,0,0,'','Ichoron - Water Globule'),
+(13,1,54266,0,0,31,0,3,29326,102901,0,0,0,'','Ichoron - Water Globule'),
+(13,1,54267,0,0,31,0,3,29326,102902,0,0,0,'','Ichoron - Water Globule'),
+(13,1,54269,0,0,31,0,3,29313,0,0,0,0,'','Ichoron - Merge');
+
+UPDATE `creature_template` SET `gossip_menu_id`=9997 WHERE `entry`=30658;
+
+UPDATE `gossip_menu_option` SET `action_menu_id`=9998 WHERE `menu_id`=9997;
+
+UPDATE `creature_template` SET `ScriptName`='npc_violet_hold_teleportation_portal' WHERE `entry`=30679;
+UPDATE `creature_template` SET `ScriptName`='npc_violet_hold_teleportation_portal_elite' WHERE `entry`=32174;
+UPDATE `creature_template` SET `ScriptName`='npc_violet_hold_teleportation_portal_intro' WHERE `entry`=31011;
+
+UPDATE `creature_template` SET `ScriptName`='npc_violet_hold_defense_system' WHERE `entry`=30837;
+
+UPDATE `creature_template` SET `unit_flags`=832 WHERE `entry` IN (31134, 31506); -- Cyanigosa
+
+UPDATE `creature_template` SET `speed_walk`=2.22222/2.5, `speed_run`=8.0/7.0, `unit_flags`=768 WHERE `entry` IN (31079, 31492); -- Azure Saboteur
+
+UPDATE `creature_template` SET `speed_walk`=4.0/2.5, `speed_run`=12.0/7.0, `unit_flags`=832 WHERE `entry` IN (29266, 31511, 32231, 32552); -- Xevozz
+UPDATE `creature_template` SET `speed_walk`=3.0/2.5, `speed_run`=3.0/7.0 WHERE `entry` IN (29271, 31514, 32582, 32583); -- Ethereal Sphere
+UPDATE `creature_template` SET `speed_walk`=4.0/2.5, `speed_run`=12.0/7.0, `unit_flags`=832 WHERE `entry` IN (29312, 31509, 32237, 32553); -- Lavanthor
+UPDATE `creature_template` SET `speed_walk`=4.0/2.5, `speed_run`=12.0/7.0, `unit_flags`=832 WHERE `entry` IN (29313, 31508, 32234, 32554); -- Ichoron
+UPDATE `creature_template` SET `speed_walk`=4.0/2.5, `speed_run`=4.0/7.0, `unit_flags`=33587200 WHERE `entry` IN (29321, 31515); -- Ichor Globule
+UPDATE `creature_template` SET `speed_walk`=4.0/2.5, `speed_run`=12.0/7.0, `unit_flags`=832 WHERE `entry` IN (29314, 31512, 32230, 32555); -- Zuramat
+UPDATE `creature_template` SET `speed_walk`=4.0/2.5, `speed_run`=10.0/7.0, `unit_flags`=33600 WHERE `entry` IN (29315, 31507, 32226, 32550); -- Erekem
+UPDATE `creature_template` SET `speed_walk`=4.0/2.5, `speed_run`=10.0/7.0, `unit_flags`=33600 WHERE `entry` IN (29395, 31513, 32228, 32549); -- Erekem Guard
+UPDATE `creature_template` SET `speed_walk`=4.0/2.5, `speed_run`=12.0/7.0, `unit_flags`=33600 WHERE `entry` IN (29316, 31510, 32235, 32551); -- Moragg
+
+UPDATE `creature_template` SET `minlevel`=77, `maxlevel`=77, `ScriptName`='boss_xevozz' WHERE `entry`=32231; -- Xevozz
+UPDATE `creature_template` SET `minlevel`=77, `maxlevel`=77, `ScriptName`='boss_lavanthor' WHERE `entry`=32237; -- Lavanthor
+UPDATE `creature_template` SET `minlevel`=77, `maxlevel`=77, `ScriptName`='boss_ichoron' WHERE `entry`=32234; -- Ichoron
+UPDATE `creature_template` SET `minlevel`=77, `maxlevel`=77, `ScriptName`='boss_zuramat' WHERE `entry`=32230; -- Zuramat
+UPDATE `creature_template` SET `minlevel`=77, `maxlevel`=77, `ScriptName`='boss_erekem' WHERE `entry`=32226; -- Erekem
+UPDATE `creature_template` SET `minlevel`=76, `maxlevel`=76, `ScriptName`='npc_erekem_guard' WHERE `entry`=32228; -- Erekem Guard
+UPDATE `creature_template` SET `minlevel`=77, `maxlevel`=77, `ScriptName`='boss_moragg' WHERE `entry`=32235; -- Moragg
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (29364, 29365); -- Void Sentry
+UPDATE `creature_template` SET `flags_extra`=0, `AIName`='', `ScriptName`='npc_void_sentry' WHERE `entry`=29364; -- Void Sentry
+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=29365; -- Void Sentry
+UPDATE `creature_template` SET `unit_flags`=0, `unit_flags2`=0 WHERE `entry` IN (29364, 31518);
+UPDATE `creature_template` SET `unit_flags`=33554432, `unit_flags2`=2080 WHERE `entry` IN (29365, 31519); -- Void Sentry
+
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x1 WHERE `entry` IN (32552, 32553, 32554, 32555, 32550, 32551);
+UPDATE `creature_template` SET `mechanic_immune_mask`=536941137 WHERE `entry` IN (32231, 32552, 32237, 32553, 32234, 32554, 32230, 32555, 32226, 32550, 32228, 32549, 32235, 32551);
+
+UPDATE `creature_template` SET `InhabitType`=4, `flags_extra`=128 WHERE `entry`=30837;
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (29326, 30896);
+UPDATE `creature` SET `modelid`=0, `spawndist`=0, `MovementType`=0 WHERE `id` IN (29326, 30896);
+
+UPDATE `creature_template` SET `AIName`='' WHERE `entry` IN (32226,32228,32230,32231,32234,32235,32237);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (32226,32228,32230,32231,32234,32235,32237);
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (30837, 30896, 31079, 29364, 29365, 31518, 31519);
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(30837, 0, 0x3000000, 0x1, '57886 57887'),
+(30896, 0, 0x3000000, 0x1, ''),
+(31079, 0, 0x0, 0x1, '31635'),
+(29364, 0, 0x0, 0x1, '54351 54341'),
+(29365, 0, 0x0, 0x1, '54351 54342'),
+(31518, 0, 0x0, 0x1, '54351 54341'),
+(31519, 0, 0x0, 0x1, '54351 59747');
+
+DELETE FROM `creature_text` WHERE `entry` IN (30658, 32204, 29271);
+DELETE FROM `creature_text` WHERE `entry`=29313 AND `groupid`=7;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(30658, 0, 0, 'Prison guards, we are leaving! These adventurers are taking over! Go go go!', 14, 0, 100, 5, 0, 0, 31474, 3, 'Lieutenant Sinclari - Intro 1'),
+(30658, 1, 0, 'I''m locking the door. Good luck, and thank you for doing this.', 12, 0, 100, 396, 0, 0, 31475, 3, 'Lieutenant Sinclari - Intro 2'),
+(30658, 2, 0, 'You did it! You held the Blue Dragonflight back and defeated their commander. Amazing work!', 12, 0, 100, 396, 0, 0, 31694, 3, 'Lieutenant Sinclari - Outro'),
+
+(32204, 0, 0, 'An elite Blue Dragonflight squad appears from the portal!', 41, 0, 100, 0, 0, 0, 32994, 3, 'Lieutenant Sinclari - Blue Dragonflight squad'),
+(32204, 1, 0, 'A Portal Guardian defends the new portal!', 41, 0, 100, 0, 0, 0, 32995, 3, 'Lieutenant Sinclari - Portal Guardian'),
+(32204, 2, 0, 'A Portal Keeper emerges from the portal!', 41, 0, 100, 0, 0, 0, 32996, 3, 'Lieutenant Sinclari - Portal Keeper'),
+(32204, 3, 0, 'Adventurers, the door is beginning to weaken!', 14, 0, 100, 0, 0, 0, 32557, 3, 'Lieutenant Sinclari - Door weaken'),
+(32204, 4, 0, 'Only half of the door seal''s strength remains! You must fight on!', 14, 0, 100, 0, 0, 0, 32558, 3, 'Lieutenant Sinclari - Half Door Seal reains'),
+(32204, 5, 0, 'The door seal is about to collapse! All is lost if the Blue Dragonflight breaks through the door!', 14, 0, 100, 0, 0, 0, 32559, 3, 'Lieutenant Sinclari - Door Seal broken'),
+
+(29313, 7, 0, '%s''s Protective Bubble shatters!', 41, 0, 100, 0, 0, 0, 30086, 0, 'Ichoron - Emote Shatter'),
+
+(29271, 0, 0, '%s begins to summon!', 41, 0, 100, 0, 0, 0, 30087, 3, 'Ethereal Sphere');
+
+UPDATE `creature_text` SET `sound`=14499 WHERE `entry`=29266 AND `groupid`=0;
+UPDATE `creature_text` SET `emote`=396 WHERE `entry`=29266 AND `groupid`=3;
+UPDATE `creature_text` SET `emote`=15 WHERE `entry`=29315 AND `groupid`=3;
+UPDATE `creature_text` SET `emote`=396 WHERE `entry`=31134 AND `groupid`=3;
+
+DELETE FROM `spell_target_position` WHERE `ID` IN (54102, 54137, 54138, 61337, 61338, 61339, 62139);
+INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `VerifiedBuild`) VALUES
+(54102, 0, 608, 1854.36, 802.65, 44.3,  12340),
+(54137, 0, 608, 1899.18, 824.7,  38.72333, 12340),
+(54138, 0, 608, 1891.42, 788.04, 38.64, 12340),
+(61337, 0, 608, 1854.36, 802.65, 44.3,  12340),
+(61338, 0, 608, 1899.18, 824.7,  38.72333, 12340),
+(61339, 0, 608, 1891.42, 788.04, 38.64, 12340),
+(62139, 0, 608, 1857.24, 803.877, 44.0085, 12340);
+
+-- 3.3.5 only
+DELETE FROM `spelldifficulty_dbc` WHERE `spellid0` IN (54102, 54137, 54138, 54207, 54438, 54442);
+INSERT INTO `spelldifficulty_dbc` (`id`, `spellid0`, `spellid1`) VALUES
+(54207, 54207, 59476),
+(54438, 54438, 59523),
+(54442, 54442, 59524);
diff --git a/sql/updates/world/2015_09_11_09_world_from_335.sql b/sql/updates/world/2015_09_11_09_world_from_335.sql
new file mode 100644
index 0000000000..18619957ef
--- /dev/null
+++ b/sql/updates/world/2015_09_11_09_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `unit_flags` = 33554432 WHERE `entry` = 34098; 
diff --git a/sql/updates/world/2015_09_11_10_world_from_335.sql b/sql/updates/world/2015_09_11_10_world_from_335.sql
new file mode 100644
index 0000000000..f261acf71e
--- /dev/null
+++ b/sql/updates/world/2015_09_11_10_world_from_335.sql
@@ -0,0 +1,2 @@
+-- Achievement The Culling of Time
+DELETE FROM `disables` WHERE `entry`=7494 AND `sourceType`=4;
diff --git a/sql/updates/world/2015_09_11_11_world_from_335.sql b/sql/updates/world/2015_09_11_11_world_from_335.sql
new file mode 100644
index 0000000000..2bb55b8bfc
--- /dev/null
+++ b/sql/updates/world/2015_09_11_11_world_from_335.sql
@@ -0,0 +1,2 @@
+DELETE FROM `trinity_string` WHERE `entry` = 364;
+INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES (364, 'Taxinodes: %s.');
diff --git a/sql/updates/world/2015_09_11_12_world_from_335.sql b/sql/updates/world/2015_09_11_12_world_from_335.sql
new file mode 100644
index 0000000000..ded18be8a7
--- /dev/null
+++ b/sql/updates/world/2015_09_11_12_world_from_335.sql
@@ -0,0 +1 @@
+UPDATE `game_event_battleground_holiday` SET `bgflag` = 1073741824 WHERE `eventEntry` = 54 ;
diff --git a/sql/updates/world/2015_09_11_13_world_from_335.sql b/sql/updates/world/2015_09_11_13_world_from_335.sql
new file mode 100644
index 0000000000..a0519693f9
--- /dev/null
+++ b/sql/updates/world/2015_09_11_13_world_from_335.sql
@@ -0,0 +1,6 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 36450;
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`,`ConditionValue2`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 3, 36450, 0, 0, 31, 0, 3, 20060, 0, 0, 0, '', 'Kael\'thas Ressurection hit only Lord Sanguinar'),
+(13, 3, 36450, 0, 1, 31, 0, 3, 20062, 0, 0, 0, '', 'Kael\'thas Ressurection hit only Grand Astromancer Capernian'),
+(13, 3, 36450, 0, 2, 31, 0, 3, 20063, 0, 0, 0, '', 'Kael\'thas Ressurection hit only Master Engineer Telonicus'),
+(13, 3, 36450, 0, 3, 31, 0, 3, 20064, 0, 0, 0, '', 'Kael\'thas Ressurection hit only Thaladred the Darkener');
diff --git a/sql/updates/world/2015_09_11_14_world_from_335.sql b/sql/updates/world/2015_09_11_14_world_from_335.sql
new file mode 100644
index 0000000000..59bf0e2bfc
--- /dev/null
+++ b/sql/updates/world/2015_09_11_14_world_from_335.sql
@@ -0,0 +1,37 @@
+--
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (32682, 27932);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (32682, 27932) AND `source_type`=0;
+UPDATE `creature_template` SET `InhabitType`=4, `speed_run`=2.5 WHERE `entry` IN (32682, 27932);
+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
+(32682, 0, 0, 0, 27, 0, 100, 1, 0, 0, 0, 0, 53, 1, 32682, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Harry''s Bomber- On passeger rided - Start wp'),
+(27932, 0, 0, 0, 27, 0, 100, 1, 0, 0, 0, 0, 53, 1, 27932, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Harry''s Bomber- On passeger rided - Start wp'),
+(32682, 0, 1, 0, 58, 0, 100, 1, 9, 32682, 0, 0, 11, 50630, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Harry''s Bomber- On waypoint ended - Eject passengers'),
+(27932, 0, 1, 0, 58, 0, 100, 1, 9, 27932, 0, 0, 11, 50630, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Harry''s Bomber- On passeger ended - Eject passengers');
+
+UPDATE `smart_scripts` SET `action_type`=85 WHERE `entryorguid`=28277 AND `source_type`=0 AND `id`=0;
+DELETE FROM `waypoints` WHERE `entry` IN (32682, 27932);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(32682, 1, 61.83957, -6228.992, 19.07242, 'Harry''s Bomber'),
+(32682, 2, -64.6518, -5908.95, 29.8502, 'Harry''s Bomber'),
+(32682, 3, -158.0859, -5631.193, 29.8502, 'Harry''s Bomber'),
+(32682, 4, -436.5865, -5223.862, 32.1002, 'Harry''s Bomber'),
+(32682, 5, -412.989, -5012.779, 45.7391, 'Harry''s Bomber'),
+(32682, 6, -75.09814, -4341.288, 64.29379, 'Harry''s Bomber'),
+(32682, 7, -51.86116, -4023.003, 70.12712, 'Harry''s Bomber'),
+(32682, 8, -136.1673, -3716.832, 59.96046, 'Harry''s Bomber'),
+(32682, 9, -170.8945, -3578.378, 4.988236, 'Harry''s Bomber'),
+(27932, 1, -136.1673, -3716.832, 59.96046, 'Harry''s Bomber'),
+(27932, 2, -51.86116, -4023.003, 70.12712, 'Harry''s Bomber'),
+(27932, 3, -75.09814, -4341.288, 64.29379, 'Harry''s Bomber'),
+(27932, 4, -412.989, -5012.779, 45.7391, 'Harry''s Bomber'),
+(27932, 5, -436.5865, -5223.862, 32.1002, 'Harry''s Bomber'),
+(27932, 6, -158.0859, -5631.193, 29.8502, 'Harry''s Bomber'),
+(27932, 7, -64.6518, -5908.95, 29.8502, 'Harry''s Bomber'),
+(27932, 8, 61.83957, -6228.992, 19.07242, 'Harry''s Bomber'),
+(27932, 9, 89.63259, -6287.430, -0.739605, 'Harry''s Bomber');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10218;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`Scriptname`,`Comment`) VALUES
+(15,10218,0,0,0,23,0,495,0,0,0,0 ,'' , 'Harry''s Bomber - Show gossip option if the npc is in the area 495'),
+(15,10218,0,0,0,9,0,11567,0,0,0,0 ,'' , 'Harry''s Bomber - Show gossip option if player has taken quest 11567'),
+(15,10218,0,0,1,28,0,11567,0,0,0,0 ,'' , 'Harry''s Bomber - Show gossip option if player has quest 11567 completed');
diff --git a/sql/updates/world/2015_09_11_15_world_from_335.sql b/sql/updates/world/2015_09_11_15_world_from_335.sql
new file mode 100644
index 0000000000..05aa1774d1
--- /dev/null
+++ b/sql/updates/world/2015_09_11_15_world_from_335.sql
@@ -0,0 +1,104 @@
+--
+DELETE FROM `creature_template_addon` WHERE `entry` IN (30477, 30487);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(30477, 0, 0, 33554432, 0, 0, '55971'),
+(30487, 0, 0, 33554432, 0, 0, '55971');
+UPDATE `creature_template` SET `vehicleid`=110 WHERE `entry`=28192;
+UPDATE `creature_template` SET `Inhabittype`=4 WHERE `entry`=24767;
+
+UPDATE `creature_template` SET `InhabitType`=4, `speed_run`=2.14286, `unit_flags`=33288 WHERE `entry`=27923;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (27923) 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
+(27923,0,0,0,54,0,100,0,0,0,0,0,1,0,2000,0,0,0,0,7,0,0,0,0,0,0,0,'Lou the Cabin Boy - On summon - Say line'),
+(27923,0,1,0,52,0,100,0,0,27923,0,0,53,1,27923,0,0,0,0,1,0,0,0,0,0,0,0,'Lou the Cabin Boy - On text over - Start WP movement'),
+(27923,0,3,0,40,0,100,0,13,27923,0,0,1,1,2000,0,0,0,0,1,0,0,0,0,0,0,0,'Lou the Cabin Boy - On WP 13 reached - Say line'),
+(27923,0,4,0,52,0,100,0,1,27923,0,0,28,46598,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lou the Cabin Boy - On text over - Remove aura Ride Vehicle Hardcoded');
+
+DELETE FROM `creature_template_addon` WHERE `entry`=23982;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(23982,0,0,1,0,0,'29266');
+
+SET @CGUID=88474;
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+11;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@CGUID+0,0,0,1,0,0,'45319'),
+(@CGUID+1,0,0,1,0,0,'45319'),
+(@CGUID+2,0,0,1,0,0,'45319'),
+(@CGUID+3,0,0,1,0,0,'45319'),
+(@CGUID+4,0,0,1,0,0,'45319'),
+(@CGUID+5,0,0,1,0,0,'45319'),
+(@CGUID+6,0,0,1,0,0,'45319'),
+(@CGUID+7,0,0,1,0,0,'45319'),
+(@CGUID+8,0,0,1,0,0,'45319'),
+(@CGUID+9,0,0,1,0,0,'45319'),
+(@CGUID+10,0,0,1,0,0,'45319'),
+(@CGUID+11,0,0,1,0,0,'45319');
+
+DELETE FROM `creature` WHERE `id`=23982;
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+64;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@CGUID+0,23033,571,1,1,0,0,121.0426,-6350.602,0.2506703,0.2617994,300,0,0,42,0,0,0,0,0),
+(@CGUID+1,23033,571,1,1,0,0,105.1841,-6356.575,7.529881,2.234021,300,0,0,42,0,0,0,0,0),
+(@CGUID+2,23033,571,1,1,0,0,122.4542,-6349.216,13.51903,0.06981317,300,0,0,42,0,0,0,0,0),
+(@CGUID+3,23033,571,1,1,0,0,137.363,-6341.455,0.6397853,4.712389,300,0,0,42,0,0,0,0,0),
+(@CGUID+4,23033,571,1,1,0,0,134.3599,-6343.983,18.43672,4.13643,300,0,0,42,0,0,0,0,0),
+(@CGUID+5,23033,571,1,1,0,0,132.2583,-6350.229,0.2506703,0.9075712,300,0,0,42,0,0,0,0,0),
+(@CGUID+6,23033,571,1,1,0,0,126.0219,-6359.624,13.29924,0.8552113,300,0,0,42,0,0,0,0,0),
+(@CGUID+7,23033,571,1,1,0,0,100.9148,-6372.519,0.2711143,1.850049,300,0,0,42,0,0,0,0,0),
+(@CGUID+8,23033,571,1,1,0,0,112.8128,-6370.394,0.2509333,5.323254,300,0,0,42,0,0,0,0,0),
+(@CGUID+9,23033,571,1,1,0,0,108.9089,-6372.98,7.581032,1.151917,300,0,0,42,0,0,0,0,0),
+(@CGUID+10,23033,571,1,1,0,0,102.7771,-6374.673,18.44771,1.48353,300,0,0,42,0,0,0,0,0),
+(@CGUID+11,23033,571,1,1,0,0,102.7771,-6374.673,18.44771,1.48353,300,0,0,42,0,0,0,0,0),
+(@CGUID+12,23982,571,1,1,0,0,86.46146,-6311.128,3.060588,4.537856,300,0,0,20958,0,0,0,0,0),
+(@CGUID+13,23982,571,1,1,0,0,90.35403,-6339.574,7.16617,4.712389,300,0,0,20958,0,0,0,0,0),
+(@CGUID+14,23982,571,1,1,0,0,83.55727,-6293.268,2.560132,5.270895,300,0,0,20958,0,0,0,0,0),
+(@CGUID+15,23982,571,1,1,0,0,97.12625,-6329.794,6.238928,5.375614,300,0,0,20958,0,0,0,0,0),
+(@CGUID+16,23982,571,1,1,0,0,70.93034,-6330.428,3.54416,2.844887,300,0,0,20958,0,0,0,0,0),
+(@CGUID+17,23982,571,1,1,0,0,51.70757,-6311.947,3.161455,5.77704,300,0,0,20958,0,0,0,0,0),
+(@CGUID+18,23982,571,1,1,0,0,98.56985,-6344.554,7.688509,2.86234,300,0,0,20958,0,0,0,0,0),
+(@CGUID+19,23982,571,1,1,0,0,131.832,-6340.606,12.63307,0.8203048,300,0,0,20958,0,0,0,0,0),
+(@CGUID+20,23982,571,1,1,0,0,129.1864,-6345.83,0.2506703,5.5676,300,0,0,20958,0,0,0,0,0),
+(@CGUID+21,23982,571,1,1,0,0,120.3932,-6350.105,13.38886,4.153883,300,0,0,20958,0,0,0,0,0),
+(@CGUID+22,23982,571,1,1,0,0,104.8288,-6357.471,7.574474,5.235988,300,0,0,20958,0,0,0,0,0),
+(@CGUID+23,23982,571,1,1,0,0,133.6459,-6343.107,18.42958,1.48353,300,0,0,20958,0,0,0,0,0),
+(@CGUID+24,23982,571,1,1,0,0,138.9828,-6343.52,0.6380893,2.792527,300,0,0,20958,0,0,0,0,0),
+(@CGUID+25,23982,571,1,1,0,0,129.1845,-6351.269,0.2506703,3.490659,300,0,0,20958,0,0,0,0,0),
+(@CGUID+26,23982,571,1,1,0,0,119.9491,-6359.686,13.22697,5.201081,300,0,0,20958,0,0,0,0,0),
+(@CGUID+27,23982,571,1,1,0,0,115.4752,-6363.241,0.2506703,2.408554,300,0,0,20958,0,0,0,0,0),
+(@CGUID+28,23982,571,1,1,0,0,103.771,-6368.571,0.2564183,2.094395,300,0,0,20958,0,0,0,0,0),
+(@CGUID+29,23982,571,1,1,0,0,110.5545,-6371.233,7.581059,1.27409,300,0,0,20958,0,0,0,0,0),
+(@CGUID+30,23982,571,1,1,0,0,100.0265,-6375.111,18.99801,2.600541,300,0,0,20958,0,0,0,0,0),
+(@CGUID+31,23982,571,1,1,0,0,96.01752,-6378.461,4.325503,5.532694,300,0,0,20958,0,0,0,0,0),
+(@CGUID+32, 23982, 571, 1, 1, 0, 0, 1545.82, -6573.38, 13.7573, 0.366519, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+33, 23982, 571, 1, 1, 0, 0, 1555.81, -6473.45, 8.12772, 1.8326, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+34, 23982, 571, 1, 1, 0, 0, 1556.01, -6468.7, 1.18524, 0.296706, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+35, 23982, 571, 1, 1, 0, 0, 1557.06, -6466.08, 19.1378, 0.191986, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+36, 23982, 571, 1, 1, 0, 0, 1560.88, -6554.92, 7.85555, 4.7822, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+37, 23982, 571, 1, 1, 0, 0, 1562.99, -6467.94, 11.5577, 0.872665, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+38, 23982, 571, 1, 1, 0, 0, 1566.2, -6453.87, 8.1297, 5.20108, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+39, 23982, 571, 1, 1, 0, 0, 1569.21, -6459.58, 0.798187, 0.959931, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+40, 23982, 571, 1, 1, 0, 0, 1571.11, -6554.08, 19.5447, 4.2237, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+41, 23982, 571, 1, 1, 0, 0, 1571.94, -6444.88, 13.4798, 4.64258, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+42, 23982, 571, 1, 1, 0, 0, 1572.78, -6465.26, 13.9275, 2.02458, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+43, 23982, 571, 1, 1, 0, 0, 1585.26, -6439.69, 8.1282, 5.74213, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+44, 23982, 571, 1, 1, 0, 0, 1585.64, -6442.62, 0.80031, 0.907571, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+45, 23982, 571, 1, 1, 0, 0, 1592.84, -6430.96, 20.0984, 4.57276, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+46, 23982, 571, 1, 1, 0, 0, 1595.97, -6429.72, 4.87117, 5.88176, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+47, 23982, 571, 1, 1, 0, 0, 1608.47, -6469.64, 11.9444, 2.3911, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+48, 23982, 571, 1, 1, 0, 0, 1633.75, -6476.69, 5.27008, 3.26377, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+49, 23982, 571, 1, 1, 0, 0, 1641.51, -6496.98, 19.3894, 2.49582, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+50, 23982, 571, 1, 1, 0, 0, 1648.43, -6518.75, 7.92241, 2.6529, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+51, 23982, 571, 1, 1, 0, 0, 1648.63, -6515.61, 0.981542, 0.0349066, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+52, 23982, 571, 1, 1, 0, 0, 1654.91, -6506.14, 16.7789, 0.734061, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+53, 23982, 571, 1, 1, 0, 0, 1659.26, -6516.77, 12.9779, 1.02974, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+54, 23982, 571, 1, 1, 0, 0, 1660.06, -6516.17, 18.1532, 0.401426, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+55, 23982, 571, 1, 1, 0, 0, 1661.93, -6510.17, 0.595421, 1.41372, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+56, 23982, 571, 1, 1, 0, 0, 1664.66, -6497.61, 7.92616, 0.349066, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+57, 23982, 571, 1, 1, 0, 0, 1667.07, -6513.15, 7.92516, 1.44862, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+58, 23982, 571, 1, 1, 0, 0, 1667.19, -6503.34, 13.7694, 4.50295, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+59, 23982, 571, 1, 1, 0, 0, 1676.57, -6488.01, 7.84255, 0.599511, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+60, 23982, 571, 1, 1, 0, 0, 1678.84, -6484.38, 7.92603, 5.16617, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+61, 23982, 571, 1, 1, 0, 0, 1680.69, -6489.71, 15.3545, 4.69494, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+62, 23982, 571, 1, 1, 0, 0, 1683.73, -6489.54, 0.600268, 3.38594, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+63, 23982, 571, 1, 1, 0, 0, 1693.21, -6481.45, 20.3186, 4.32842, 300, 0, 0, 20958, 0, 0, 0,0,0),
+(@CGUID+64, 23982, 571, 1, 1, 0, 0, 1693.28, -6480.37, 4.67026, 2.49582, 300, 0, 0, 20958, 0, 0, 0,0,0);
diff --git a/sql/updates/world/2015_09_11_16_world_from_335.sql b/sql/updates/world/2015_09_11_16_world_from_335.sql
new file mode 100644
index 0000000000..44ec964d97
--- /dev/null
+++ b/sql/updates/world/2015_09_11_16_world_from_335.sql
@@ -0,0 +1,345 @@
+--
+SET @CGUID := 144155; -- 80 free guid set by TC
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+79;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 30136, 571, 1, 2, 7443.688, -997.967, 791.5563, 5.77704, 0, 0, 0),
+(@CGUID+1, 30136, 571, 1, 2, 7464.026, -982.6368, 796.7954, 5.445427, 0, 0, 0),
+(@CGUID+2, 30136, 571, 1, 2, 7439.698, -1004.994, 791.5581, 5.88176, 0, 0, 0),
+(@CGUID+3, 30136, 571, 1, 2, 7432.88, -996.9908, 538.754, 5.8294, 0, 0, 0),
+(@CGUID+4, 30136, 571, 1, 2, 7440.099, -971.4941, 596.7019, 5.5676, 0, 0, 0),
+(@CGUID+5, 30136, 571, 1, 2, 7443.239, -957.6465, 704.6074, 5.445427, 0, 0, 0),
+(@CGUID+6, 30136, 571, 1, 2, 7436.259, -995.6957, 538.7682, 5.794493, 0, 0, 0),
+(@CGUID+7, 30136, 571, 1, 2, 7453.724, -975.0106, 538.7589, 5.480334, 0, 0, 0),
+(@CGUID+8, 30136, 571, 1, 2, 7453.564, -978.4579, 538.7731, 5.51524, 0, 0, 0),
+(@CGUID+9, 30136, 571, 1, 2, 7432.952, -993.7203, 594.6988, 5.794493, 0, 0, 0),
+(@CGUID+10, 30136, 571, 1, 2, 7470.03, -953.4771, 538.7057, 5.183628, 0, 0, 0),
+(@CGUID+11, 30136, 571, 1, 2, 7509.529, -942.8323, 596.5732, 4.747295, 0, 0, 0),
+(@CGUID+12, 30136, 571, 1, 2, 7512.031, -952.4295, 793.3883, 4.729842, 0, 0, 0),
+(@CGUID+13, 30136, 571, 1, 2, 7522.184, -944.5262, 538.7827, 4.590216, 0, 0, 0),
+(@CGUID+14, 30136, 571, 1, 2, 7567.444, -977.0383, 595.8424, 3.944444, 0, 0, 0),
+(@CGUID+15, 30136, 571, 1, 2, 7587.854, -1034.644, 711.9574, 3.159046, 0, 0, 0),
+(@CGUID+16, 30136, 571, 1, 2, 7496.645, -940.393, 538.7007, 4.886922, 0, 0, 0),
+(@CGUID+17, 30136, 571, 1, 2, 7530.056, -967.2031, 689.8135, 4.45059, 0, 0, 0),
+(@CGUID+18, 30136, 571, 1, 2, 7536.476, -957.3798, 594.0485, 4.39823, 0, 0, 0),
+(@CGUID+19, 30136, 571, 1, 2, 7518.525, -943.5374, 538.7671, 4.642576, 0, 0, 0),
+(@CGUID+20, 30136, 571, 1, 2, 7524.424, -965.8981, 688.9619, 4.537856, 0, 0, 0),
+(@CGUID+21, 30136, 571, 1, 2, 7480.429, -1015.052, 738.4304, 5.707227, 0, 0, 0),
+(@CGUID+22, 30136, 571, 1, 2, 7562.215, -946.9121, 816.2698, 4.18879, 0, 0, 0),
+(@CGUID+23, 30136, 571, 1, 2, 7493.477, -944.535, 596.1667, 4.921828, 0, 0, 0),
+(@CGUID+24, 30136, 571, 1, 2, 7594.04, -1016.391, 710.2169, 3.368485, 0, 0, 0),
+(@CGUID+25, 30136, 571, 1, 2, 7561.688, -985.4562, 696.1497, 3.926991, 0, 0, 0),
+(@CGUID+26, 30493, 571, 1, 2, 7258.688, -865.7031, 924.9865, 5.602507, 0, 0, 0),
+(@CGUID+27, 30502, 571, 1, 2, 7246.357, -866.1553, 924.8257, 0.03490658, 0, 0, 0),
+(@CGUID+28, 30502, 571, 1, 2, 7329.806, -1027.244, 908.9823, 1.902409, 0, 0, 0),
+(@CGUID+29, 30502, 571, 1, 2, 7258.124, -851.6719, 926.1149, 4.869469, 0, 0, 0),
+(@CGUID+30, 30502, 571, 1, 2, 7379.61, -910.0995, 908.1426, 2.670354, 0, 0, 0),
+(@CGUID+31, 30502, 571, 1, 2, 7360.499, -1137.121, 907.58, 1.937315, 0, 0, 0),
+(@CGUID+32, 30502, 571, 1, 2, 7518.664, -1240.335, 913.9808, 3.822271, 0, 0, 0),
+(@CGUID+33, 30502, 571, 1, 2, 7369.898, -1214.435, 904.9849, 0.2268928, 0, 0, 0),
+(@CGUID+34, 30502, 571, 1, 2, 7283.155, -1084.717, 939.2233, 1.762783, 0, 0, 0),
+(@CGUID+35, 30502, 571, 1, 2, 7451.647, -843.4373, 917.2958, 3.246312, 0, 0, 0),
+(@CGUID+36, 30502, 571, 1, 2, 7261.373, -1013.67, 918.5519, 1.413717, 0, 0, 0),
+(@CGUID+37, 30502, 571, 1, 2, 7606.527, -1225.569, 929.4883, 4.29351, 0, 0, 0),
+(@CGUID+38, 30502, 571, 1, 2, 7554.601, -1320.671, 930.3687, 4.660029, 0, 0, 0),
+(@CGUID+39, 30502, 571, 1, 2, 7430.659, -1318.579, 911.7595, 4.468043, 0, 0, 0),
+(@CGUID+40, 30502, 571, 1, 2, 7283.702, -1305.297, 909.7721, 5.88176, 0, 0, 0),
+(@CGUID+41, 30064, 571, 1, 2, 7260.882, -1363.916, 911.7665, 0.4014257, 0, 0, 0),
+(@CGUID+42, 30064, 571, 1, 2, 7294.543, -1239.342, 910.2243, 6.126106, 0, 0, 0),
+(@CGUID+43, 30064, 571, 1, 2, 7447.73, -1222.154, 906.4549, 3.979351, 0, 0, 0),
+(@CGUID+44, 30064, 571, 1, 2, 7021.103, -1281.485, 925.2195, 5.751715, 0, 0, 0),
+(@CGUID+45, 30064, 571, 1, 2, 7366.789, -921.5516, 908.176, 1.151917, 0, 0, 0),
+(@CGUID+46, 30064, 571, 1, 2, 7366.549, -1167.878, 907.7737, 4.276057, 0, 0, 0),
+(@CGUID+47, 30064, 571, 1, 2, 7266.572, -1061.63, 941.623, 3.45743, 0, 0, 0),
+(@CGUID+48, 30064, 571, 1, 2, 7274.531, -973.0413, 919.6902, 3.892084, 0, 0, 0),
+(@CGUID+49, 30064, 571, 1, 2, 7344.521, -1002.784, 907.9092, 1.370535, 0, 0, 0),
+(@CGUID+50, 30504, 571, 1, 2, 7264.177, -1064.293, 941.6094, 1.58825, 0, 0, 0),
+(@CGUID+51, 30504, 571, 1, 2, 7261.539, -1060.268, 942.1428, 1.58825, 0, 0, 0),
+(@CGUID+52, 30504, 571, 1, 2, 7258.846, -1064.966, 941.6843, 1.570796, 0, 0, 0),
+(@CGUID+53, 30504, 571, 1, 2, 7285.515, -995.3761, 915.2917, 1.780236, 0, 0, 0),
+(@CGUID+54, 30504, 571, 1, 2, 7291.571, -993.6209, 915.0613, 1.832596, 0, 0, 0),
+(@CGUID+55, 30504, 571, 1, 2, 7284.015, -942.5671, 919.7255, 1.884956, 0, 0, 0),
+(@CGUID+56, 30504, 571, 1, 2, 7295.979, -986.884, 915.3113, 1.867502, 0, 0, 0),
+(@CGUID+57, 30504, 571, 1, 2, 7297.396, -992.0636, 914.5924, 1.867502, 0, 0, 0),
+(@CGUID+58, 30504, 571, 1, 2, 7290.535, -988.4466, 915.6047, 1.832596, 0, 0, 0),
+(@CGUID+59, 30504, 571, 1, 2, 7288.845, -939.8006, 919.2185, 1.954769, 0, 0, 0),
+(@CGUID+60, 30504, 571, 1, 2, 7284.822, -936.735, 920.152, 1.919862, 0, 0, 0),
+(@CGUID+61, 30504, 571, 1, 2, 7284.391, -990.1196, 915.7115, 1.780236, 0, 0, 0),
+(@CGUID+62, 30504, 571, 1, 2, 7347.897, -934.4936, 908.6702, 2.478368, 0, 0, 0),
+(@CGUID+63, 30504, 571, 1, 2, 7352.746, -928.9537, 908.5024, 2.548181, 0, 0, 0),
+(@CGUID+64, 30504, 571, 1, 2, 7345.77, -927.7479, 909.7731, 2.513274, 0, 0, 0),
+(@CGUID+65, 30504, 571, 1, 2, 7278.971, -906.7933, 926.6701, 2.042035, 0, 0, 0),
+(@CGUID+66, 30504, 571, 1, 2, 7328.465, -894.0953, 920.5985, 2.75762, 0, 0, 0),
+(@CGUID+67, 30504, 571, 1, 2, 7271.211, -905.6917, 927.1619, 1.902409, 0, 0, 0),
+(@CGUID+68, 30504, 571, 1, 2, 7326.755, -908.373, 917.7892, 2.583087, 0, 0, 0),
+(@CGUID+69, 30504, 571, 1, 2, 7330.237, -902.4053, 918.4761, 2.670354, 0, 0, 0),
+(@CGUID+70, 30504, 571, 1, 2, 7281.855, -898.8499, 926.4277, 2.199115, 0, 0, 0),
+(@CGUID+71, 30504, 571, 1, 2, 7284.128, -903.6423, 926.1991, 2.181662, 0, 0, 0),
+(@CGUID+72, 30504, 571, 1, 2, 7273.202, -910.2079, 927.0142, 1.902409, 0, 0, 0),
+(@CGUID+73, 30504, 571, 1, 2, 7321.779, -905.3262, 919.6216, 2.583087, 0, 0, 0),
+(@CGUID+74, 30504, 571, 1, 2, 7276.896, -902.2155, 926.9134, 2.059489, 0, 0, 0),
+(@CGUID+75, 30504, 571, 1, 2, 7333.466, -896.3923, 918.7648, 2.75762, 0, 0, 0),
+(@CGUID+76, 30382, 571, 1, 1, 7525.702, -971.7235, 478.799, 5.637414, 0, 0, 0),
+(@CGUID+77, 30383, 571, 1, 1, 7515.811, -975.2843, 467.4983, 3.857178, 0, 0, 0),
+(@CGUID+78, 30401, 571, 1, 1, 6647.1733, -310.2567, 989.5303, 1.2511, 0, 0, 0),
+(@CGUID+79, 30504, 571, 1, 2, 7325.687, -899.111, 920.3403, 2.758484, 0, 0, 0);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=30493;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(30493, 0, 0, 0, 0, 0, '29266');
+
+DELETE FROM `creature_addon` WHERE `guid`=@CGUID+78;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(@CGUID+78, 0, 0, 0, 0, 0, '54503'); -- quest invisibility
+
+DELETE FROM `spell_area` WHERE `spell`=55782 AND `area`=4432;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(55782, 4432, 12973, 0, 0, 0, 2, 1, 74, 0);
+
+DELETE FROM `spell_area` WHERE `spell`=54504 AND `area`=4428;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(54504, 4428, 12973, 0, 0, 0, 2, 1, 10, 0);
+
+SET @Brann          := 30107; 
+SET @Brann1         := 30382; -- Brann   60888 cosmetic movement
+SET @Brann2         := 30405;
+SET @Machine        := 30134; -- Machine
+SET @Soldier        := 30136; -- Stormforged Soldier  
+Set @Yorg           := 30408; -- Yorg Stormheart spell to summon=56676
+Set @Magni          := 30411; -- Magni Bronzebeard spell to summon=56697
+SET @SPELL1         := 56603;
+SET @Machine2       := 30383; -- Machine static
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Soldier AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Brann1 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Brann1*100 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Brann2 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Brann2*100 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Brann AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Brann*100 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Brann*100+1 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Machine AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Machine*100 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Machine2 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Yorg AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Yorg*100 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Yorg*100+1 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Magni AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Magni*100 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Magni*100+1 AND `source_type` = 9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(@Brann1, 0, 0, 0, 19, 0, 100, 0, 12973, 0, 0, 0, 80, @Brann1*100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Brann - On Quest Accept - action list'),
+(@Brann1*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 56558, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Brann - action liste - cast spell to invoque'),
+(@brann1*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 19, @Machine2, 20, 0, 0, 0, 0, 0, 'Brann  - On ActionList - despawn'),
+(@brann1*100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 44, 3, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Brann  - On ActionList - Set phase 3'),
+(@brann1*100, 9, 3, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Brann  - On ActionList - despawn'),
+(@Brann1, 0, 1, 0, 1, 0, 100, 0, 4000, 4000, 4000, 7000, 11, 60888, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Brann - Ooc - Cast cosmetic movement'),
+(@Machine, 0, 16, 0, 63, 0, 100, 0, 0, 0, 0, 0, 44, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Machine - Just created - Set phase 3'),
+(@Machine, 0, 0, 0, 27, 0, 100, 0, 0, 0, 0, 0, 80, @Machine*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Machine - On passeger boarded - action list'),
+(@Machine*100, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 53, 1, @Machine, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Machine - action list - start wp'),
+(@Machine*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 19, @Brann, 10, 0, 0, 0, 0, 0, 'Brann - On Script - Set React Passive'),
+(@Machine*100, 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, 'Machine - On Script - Set React Passive'), 
+(@Machine*100, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 18, 131072, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Machine - On Script - set PACIFIED'),
+(@Soldier, 0, 0, 0, 0, 0, 100, 0, 3000, 3000, 4000, 4000, 11, 56621, 1, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0,0,'Stormforged Soldier - In Combat - Cast Thunder Orb'),
+(@Machine, 0, 1, 0, 40, 0, 100, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 2, 0, 40, 0, 100, 0, 4, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 3, 0, 40, 0, 100, 0, 7, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 4, 0, 40, 0, 100, 0, 22, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 5, 0, 40, 0, 100, 0, 27, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 6, 0, 40, 0, 100, 0, 31, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 7, 0, 40, 0, 100, 0, 35, 0, 0, 0, 1, 6, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 8, 0, 40, 0, 100, 0, 36, 0, 0, 0, 1, 7, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 9, 0, 40, 0, 100, 0, 41, 0, 0, 0, 1, 8, 0, 0, 0, 0, 0, 19, @brann, 10, 0, 0, 0, 0, 0, 'Machine - On waypoint - talk'),
+(@Machine, 0, 10, 11, 40, 0, 100, 0, 42, 0, 0, 0, 11, 68576, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Machine - On waypoint - Eject passengenrs'),
+(@Machine, 0, 11, 12, 61, 0, 100, 0, 0, 0, 0, 0, 85, 56675, 0, 0, 0, 0, 0, 21, 20, 0, 0, 0, 0, 0, 0, 'Machine - On waypoint - Invoker cast to Spawn Brann'),
+(@Machine, 0, 12, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 1000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Machine  - On waypoint - Despawn'),
+(@Machine, 0, 13, 0, 1, 0, 100, 0, 3000, 3000, 3000, 3000, 86, 56622, 1, 9, @Soldier, 5, 50, 1, 0, 0, 0, 0, 0, 0, 0, 'Machine  - OOC - CROSSCAST'),
+(@Machine, 0, 14, 0, 1, 0, 100, 0, 3000, 3000, 3000, 3000, 86, 55089, 1, 19, @Soldier, 40, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Machine - OOC - CROSSCAST'),
+(@brann2, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 83, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - Just created - Remove npcflag'),
+(@brann2, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, @brann2*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - Has aura - action list'),
+(@brann2*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - set run off'),
+(@brann2*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6696.584473, -301.435760, 989.392761, 3.094404, 'brann - ActionList - move to pos'),
+(@brann2*100, 9, 2, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 11, 56676, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList- spawn Yorg'),
+(@brann2*100, 9, 3, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 4, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 5, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 6, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 7, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 8, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 9, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 10, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 4, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 11, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 5, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 12, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 13, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 14, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 56697, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - spawn Magni'),
+(@brann2*100, 9, 15, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 16, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 66, 2.662433, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6696.584473, -301.435760, 989.392761, 2.662433, 'brann - ActionList - Set orientation'),
+(@brann2*100, 9, 17, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 6, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 18, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 19, @Magni, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 19, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 7, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 20, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 19, @Magni, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 21, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 8, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 22, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 9, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 23, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 4, 0, 0, 0, 0, 0, 19, @Magni, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 24, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 5, 0, 0, 0, 0, 0, 19, @Magni, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 25, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 10, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 26, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 27, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 11, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 28, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 6, 0, 0, 0, 0, 0, 19, @Magni, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 29, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 12, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 30, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 7, 0, 0, 0, 0, 0, 19, @Magni, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 31, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 32, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 13, 0, 0, 0, 0, 0, 19, @Yorg, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 33, 0, 0, 0, 100, 0, 0, 0, 0, 0, 75, 71385, 0, 0, 0, 0, 0, 11, @Yorg, 20, 0, 0, 0, 0, 0, 'brann - ActionList - add aura'),
+(@brann2*100, 9, 34, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 8, 0, 0, 0, 0, 0, 19, @Magni, 10, 0, 0, 0, 0, 0, 'brann - ActionList - talk'),
+(@brann2*100, 9, 35, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 75, 71385, 0, 0, 0, 0, 0, 11, @Magni, 20, 0, 0, 0, 0, 0, 'brann - ActionList - add aura'),  
+(@brann2*100, 9, 36, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 56742, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'brann - ActionList - Cast credit spell'),
+(@brann2*100, 9, 37, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6740.549316, -293.961212, 993.427979, 3.559861, 'brann - ActionList - move to pos'),
+(@brann2*100, 9, 38, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Brann  - On ActionList - despawn'),
+(@Yorg, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 80, @Yorg*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Yorg - On spawn - ActionList'),
+(@Yorg*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Yorg - ActionList - set run off'),
+(@Yorg*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6692.118164, -301.678192, 989.427734, 6.194374, 'Yorg - ActionList - go to pos'),
+(@Yorg*100, 9, 2, 0, 0, 0, 100, 0, 90000, 90000, 0, 0, 66, 0.579558, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6692.118164, -301.678192, 989.427734, 0.579558, 'Yorg - ActionList - Set orientation'),
+(@Yorg, 0, 1, 0, 23, 0, 100, 1, 71385, 1, 0, 0, 80, @Yorg*100+1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Yorg - call timed actionlist when has aura'),
+(@Yorg*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6608.733887, -282.180756, 986.123230, 3.491027, 'Yorg - ActionList - move to pos'),
+(@Yorg*100+1, 9, 1, 0, 0, 0, 100, 0, 25000, 25000, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Yorg  - ActionList - despawn'),
+(@Magni, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 80, @Magni*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Magni - On Spawn - ActionList'),
+(@Magni*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6694.134766, -297.678925, 989.207092, 4.757878, 'Magni - ActionList - Go to pos'),
+(@Magni*100, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Magni - ActionList - talk'),
+(@Magni*100, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Magni - ActionList - talk'),
+(@Magni*100, 9, 3, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 66, 4.757878, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6694.134766, -297.678925, 989.207092, 4.757878, 'Magni - ActionList - Set orientation'),
+(@Magni, 0, 1, 0, 23, 0, 100, 1, 71385, 1, 0, 0, 80, @Magni*100+1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Magni - call timed actionlist when has aura'),
+(@Magni*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Magni - ActionList - Set run off'),
+(@Magni*100+1, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 6740.549316, -293.961212, 993.427979, 3.559861, 'Magni - ActionList - Go to pos'),
+(@Magni*100+1, 9, 2, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Magni  - ActionList - despawn');
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`in (@Brann, @Brann1, @Brann2, @Magni, @Yorg, @Machine, @Machine2);
+UPDATE `creature_template` SET `faction`=2102, `AIName`='SmartAI' WHERE `entry`=@Soldier;
+UPDATE `creature_template` SET `faction`=35, `npcflag`=16777216, `type_flags`=2048, `speed_run`=2.14, `VehicleId`=219, `InhabitType`=4, `RegenHealth`=0 WHERE `entry`=@Machine;
+UPDATE `creature_template` SET `unit_flags`=537166144, `dynamicflags`=32 WHERE  `entry`=30493;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=56621;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,56621,0,0,31,0,3,@Soldier,0,1,0,0,'','Only the Machine is a target for the spell.');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=56622;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,56622,0,0,31,0,3,@Soldier,0,1,0,0,'','Only the Machine is a target for the spell.');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=@Machine;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,@Machine,0,0,9,0,12973,0,0,0,0,'','Vehicle flying machine require quest 12973');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=55089;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,55089,0,0,31,0,3,@Machine,0,0,0,0,'','Only the flying machine is a target for the spell.');
+
+DELETE FROM `vehicle_template_accessory` where `entry`= @Machine;
+INSERT INTO `vehicle_template_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`description`,`summontype`,`summontimer`)
+VALUES(@Machine,@Brann,0,1,'Brann flying machine',8,0);
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` = @Machine;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES
+(@Machine, 43671, 1, 1),
+(@Machine, @SPELL1, 1, 0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry` IN  (@SPELL1, 43671);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(18,@Machine,@SPELL1,0,0,9,0,12973,0,0,0,0,'','Required quest active for spellclick'),
+(18,@Machine,43671,0,0,31,0,3,0,0,0,0,'','Only npc for spellclick');
+
+DELETE FROM `spell_target_position` WHERE `id`=56558; 
+INSERT INTO `spell_target_position` (`id`,`mapid`,`positionx`,`positiony`,`positionz`,`orientation`) VALUES
+(56558, 571, 7515.810059, -975.283997, 478.508027, 3.883507);
+DELETE FROM `spell_target_position` WHERE `id`=56676;
+INSERT INTO `spell_target_position` (`id`,`mapid`,`positionx`,`positiony`,`positionz`,`orientation`) VALUES
+(56676, 571, 6668.243164, -300.716309, 989.048035, 0.049131);  
+DELETE FROM `spell_target_position` WHERE `id`=56697;
+INSERT INTO `spell_target_position` (`id`,`mapid`,`positionx`,`positiony`,`positionz`,`orientation`) VALUES
+(56697, 571, 6646.655762, -292.56268, 982.318909, 6.077349); 
+
+DELETE FROM `waypoints` WHERE entry=@Machine;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@Machine,1,7482.256, -1010.183, 480.4727,'Brann flying machine'),
+(@Machine,2,7487.624, -1073.279, 486.6947,'Brann flying machine'),
+(@Machine,3,7554.068, -1073.744, 504.4724,'Brann flying machine'),
+(@Machine,4,7540.521, -994.4729, 521.6666,'Brann flying machine'),
+(@Machine,5,7476.892, -979.5384, 539.4715,'Brann flying machine'),
+(@Machine,6,7441.698, -1035.954, 552.1108,'Brann flying machine'),
+(@Machine,7,7471.937, -1091.025, 565.5829,'Brann flying machine'),
+(@Machine,8,7510.604, -1098.736, 585.0275,'Brann flying machine'),
+(@Machine,9,7560.741, -1064.01, 596.1101,'Brann flying machine'),
+(@Machine,10,7558.652, -991.4143, 606.4708,'Brann flying machine'),
+(@Machine,11,7481.208, -966.8239, 614.276,'Brann flying machine'),
+(@Machine,12,7430.998, -1039.164, 622.7203,'Brann flying machine'),
+(@Machine,13,7464.418, -1092.93, 634.8871,'Brann flying machine'),
+(@Machine,14,7535.688, -1088.016, 651.7204,'Brann flying machine'),
+(@Machine,15,7563.452, -1036.534, 661.0538,'Brann flying machine'),
+(@Machine,16,7516.293, -977.355, 676.6924,'Brann flying machine'),
+(@Machine,17,7455.716, -999.9194, 689.1921,'Brann flying machine'),
+(@Machine,18,7447.983, -1050.863, 710.22,'Brann flying machine'),
+(@Machine,19,7518.54, -1090.449, 733.2756,'Brann flying machine'),
+(@Machine,20,7565.333, -1038.004, 745.6921,'Brann flying machine'),
+(@Machine,21,7532.994, -979.3826, 757.9145,'Brann flying machine'),
+(@Machine,22,7434.272, -1013.309, 756.1094,'Brann flying machine'),
+(@Machine,23,7460.686, -1081.453, 775.8036,'Brann flying machine'),
+(@Machine,24,7518.524, -1091.506, 800.887,'Brann flying machine'),
+(@Machine,25,7563.83, -1015.821, 824.6927,'Brann flying machine'),
+(@Machine,26,7485.566, -970.3575, 842.8317,'Brann flying machine'),
+(@Machine,27,7446.667, -1061.756, 867.8871,'Brann flying machine'),
+(@Machine,28,7479.346, -1108.014, 896.2759,'Brann flying machine'),
+(@Machine,29,7534.174, -1115.574, 932.2327,'Brann flying machine'),
+(@Machine,30,7583.952, -1166.912, 949.7326,'Brann flying machine'),
+(@Machine,31,7569.052, -1238.047, 949.7327,'Brann flying machine'),
+(@Machine,32,7505.558, -1260.738, 959.0381,'Brann flying machine'),
+(@Machine,33,7425.231, -1227.18, 965.1213,'Brann flying machine'),
+(@Machine,34,7358.262, -1154.908, 965.1213,'Brann flying machine'),
+(@Machine,35,7316.554, -1004.713, 969.5936,'Brann flying machine'),
+(@Machine,36,7273.263, -897.3846, 973.7048,'Brann flying machine'),
+(@Machine,37,7216.268, -811.6398, 984.3438,'Brann flying machine'),
+(@Machine,38,7148.946, -634.7748, 984.3438,'Brann flying machine'),
+(@Machine,39,7051.731, -506.0969, 984.3438,'Brann flying machine'),
+(@Machine,40,6928.087, -372.7923, 1013.677,'Brann flying machine'),
+(@Machine,41,6820.645, -310.3642, 1017.538,'Brann flying machine'),
+(@Machine,42,6741.966, -291.7396, 996.2623,'Brann flying machine'); 
+
+DELETE FROM `creature_text` WHERE `entry` IN (@Brann, @Yorg, @Magni, @Brann2) ;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
+(@Brann, 0, 0, 'I can''t thank you enough for all of your help in putting together the keystone. Great things will come of this, I assure you.', 12, 0, 100, 0, 0, 0, 'Brann', 31023),
+(@Brann, 1, 0, 'Iron dwarves... everywhere.... they''re making their way down from the top. They certainly are persistent.', 12, 0, 100, 0, 0, 0, 'Brann', 31024),
+(@Brann, 2, 0, 'They''re trying to take down the plane! I can''t pull up any steeper... you need to keep them off of us!', 12, 0, 100, 0, 0, 0, 'Brann', 31025),
+(@Brann, 3, 0, 'There are more just ahead - keep at it!', 12, 0, 100, 0, 0, 0, 'Brann', 31026),
+(@Brann, 4, 0, 'We''re almost out... just a little bit further.', 12, 0, 100, 0, 0, 0, 'Brann', 31027),
+(@Brann, 5, 0, 'Barring stray boulders from those giants, we should be clear... it seems a mess from down there though.', 12, 0, 100, 0, 0, 0, 'Brann', 31028),
+(@Brann, 6, 0, 'Their numbers are unbelievable... I''m glad to hear King Stormheart came to your aid. I only hear good things of him - I think it''s high time we meet.', 12, 0, 100, 0, 0, 0, 'Brann', 31029),
+(@Brann, 7, 0, 'Poor Creteus. He was a good keeper... I''m glad he at least got to see his task to completion, I imagine that''s all that really mattered to him.', 12, 0, 100, 0, 0, 0, 'Brann', 31030),
+(@Brann, 8, 0, 'We''re coming up on Frosthold. I would be very appreciative if you would introduce me to King Stormeheart before you go. I believe we are both very much in his debt.', 12, 0, 100, 0, 0, 0, 'Brann', 31031),
+(@Brann2, 0, 0, 'By all the gods... it can''t be... Muradin?', 12, 0, 100, 0, 0, 0, 'Brann', 31032),
+(@Brann2, 1, 0, 'Come on boy, there''s no mistak''n it - it''s definately you. Don''t ya recognize your younger brother?', 12, 0, 100, 0, 0, 0, 'Brann', 31033),
+(@Brann2, 2, 0, 'I can''t believe this! You were dead! All accounts said so... what happened, Muradin. How did you get here?', 12, 0, 100, 0, 0, 0, 'Brann', 31034),
+(@Brann2, 3, 0, 'Indeed! Magni will be so happy to see you too! He''s gotten nothing but bad news for a long time now, but this changes everything!', 12, 0, 100, 0, 0, 0, 'Brann', 31035),
+(@Brann2, 4, 0, 'He''s here in Northrend, brother, looking for you. A seer in Wintergarde brought word that you were not dead, and he left Ironforge immediately to come find you.', 12, 0, 100, 0, 0, 0, 'Brann', 31036),
+(@Brann2, 5, 0, 'Speaking of which...', 12, 0, 100, 0, 0, 0, 'Brann', 31087),
+(@Brann2, 6, 0, 'That''s in the past, Muradin. Regrets won''t change anything.', 12, 0, 100, 0, 0, 0, 'Brann', 31096),
+(@Brann2, 7, 0, 'Aye, be safe Muradin. I''d join you, but I''m on top of the most amazing discovery the world has yet seen. I can''t abandon it now.', 12, 0, 100, 0, 0, 0, 'Brann', 31102),
+(@Yorg, 0, 0, 'What''s that? You talkin'' to me, lad?', 12, 0, 100, 0, 0, 0, 'Yorg', 31037),
+(@Yorg, 1, 0, 'My brother... yes... I do have brothers...', 12, 0, 100, 0, 0, 0, 'Yorg', 31038),
+(@Yorg, 2, 0, 'Muradin clutches his head and reels for a moment as the memories rush back to him.', 16, 0, 100, 0, 0, 0, 'Yorg', 31039),
+(@Yorg, 3, 0, '...Brann?', 12, 0, 100, 0, 0, 0, 'Yorg', 31040),
+(@Yorg, 4, 0, 'I... I dunno, Brann. I''ve been ''ere a long time... all I ''ave of me life before this place are flashes and nightmares.', 12, 0, 100, 0, 0, 0, 'Yorg', 31042),
+(@Yorg, 5, 0, 'It''s good te see you though, brother. More than words can say.', 12, 0, 100, 0, 0, 0, 'Yorg', 31043),
+(@Yorg, 6, 0, 'Magn! Forgive me, the memories are comin'' back slowly, brother.', 12, 0, 100, 0, 0, 0, 'Yorg', 31045),
+(@Yorg, 7, 0, 'The frostborn have been very good to me. They''re strong people.', 12, 0, 100, 0, 0, 0, 'Yorg', 31048),
+(@Yorg, 8, 0, 'Not much, Magni. I''ve had nightmares of a human... tall... light hair... death black armor. His name rests on the tip of me tongue, but...', 12, 0, 100, 0, 0, 0, 'Yorg', 31089),
+(@Yorg, 9, 0, '...Arthas.', 12, 0, 100, 0, 0, 0, 'Yorg', 31091),
+(@Yorg, 10, 0, 'Aye, I know. I watched him turn... I watched him give up all that was right and I didn''t lift a hand... I didn''t even consider it until it was too late.', 12, 0, 100, 0, 0, 0, 'Yorg', 31094),
+(@Yorg, 11, 0, 'No... no they won''t. But I can make this right. I have te. I''m goin'' after the boy. I''ll make''m answer for everything he''s done.', 12, 0, 100, 0, 0, 0, 'Yorg', 31097),
+(@Yorg, 12, 0, 'I''m sure, Magni. I''ll see this through, don''t ya worry.', 12, 0, 100, 0, 0, 0, 'Yorg', 31100),
+(@Yorg, 13, 0, 'Go Brann. Bring back an epic tale when we meet again. Farewell for now, brothers...', 12, 0, 100, 0, 0, 0, 'Yorg', 31103),
+(@Magni, 0, 0, 'Look, Lagnus, I consider you a capable man, but my patience is wearing thin. I know that Muradin is here, can you point me to him or not?', 14, 0, 100, 0, 0, 0, 'Magni', 31084),
+(@Magni, 1, 0, 'Brother! There you are! I can barely believe my eyes... you''re alive!', 14, 0, 100, 0, 0, 0, 'Magni', 31085),
+(@Magni, 2, 0, 'It''s so good to see you again, Muradin. And what''s this I heard about you being a King in your own right now? The Bronzebeards were always destined to greatness.', 12, 0, 100, 0, 0, 0, 'Magni', 31086),
+(@Magni, 3, 0, 'So it seems! And you haven''t lost any muscle yourself. Do you remember anything of what happened, Muradin? Fate as turned ill in your absence.', 12, 0, 100, 0, 0, 0, 'Magni', 31088),
+(@Magni, 4, 0, 'Magni nods.', 16, 0, 100, 0, 0, 0, 'Magni', 31092),
+(@Magni, 5, 0, 'He''s not the boy of your memories anymore, Muradin. He''s become something else entirely.', 12, 0, 100, 0, 0, 0, 'Magni', 31093),
+(@Magni, 6, 0, 'Are you sure Muradin? I just got you back after years of thinking you were dead. I do not want to lose you again.', 12, 0, 100, 0, 0, 0, 'Magni', 31099),
+(@Magni, 7, 0, 'So be it then. I have to return to my people, brothers. Come back to me in one piece.', 12, 0, 100, 0, 0, 0, 'Magni', 31101),
+(@Magni, 8, 0, '...farewell brother.', 12, 0, 100, 0, 0, 0, 'Magni', 31129);
+
+UPDATE `gameobject` SET `phaseMask`=7 WHERE id=195308;
diff --git a/sql/updates/world/2015_09_11_17_world_from_335.sql b/sql/updates/world/2015_09_11_17_world_from_335.sql
new file mode 100644
index 0000000000..7d52066442
--- /dev/null
+++ b/sql/updates/world/2015_09_11_17_world_from_335.sql
@@ -0,0 +1,49 @@
+-- 
+DELETE FROM `creature` WHERE `guid`=126052;
+DELETE FROM `creature_addon` WHERE `guid`=126052;
+DELETE FROM `linked_respawn` WHERE `guid`=126052 AND `linkedGuid`=126103;
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (26668, 30810);
+UPDATE `smart_scripts` SET `action_param6`=2 WHERE `entryorguid`=-126160 AND `id`=0;
+
+UPDATE `creature_template` SET `RegenHealth`=0 WHERE `entry`=12423;
+
+-- Spawn some missing 'Ghostclaw Ravager' and 'Greater Spindleweb' in Ghostlands
+SET @CGUID := 130434;
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID AND @CGUID+23;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 16349, 530, 1, 1, 6949.108, -6818.657, 48.41008, 2.161509, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+1, 16352, 530, 1, 1, 6933.826, -6715.566, 23.84517, 3.122064, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+2, 16352, 530, 1, 1, 6968.374, -6953.108, 51.54251, 2.980778, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+3, 16352, 530, 1, 1, 6890.797, -6722.461, 39.58191, 2.24407, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+4, 16352, 530, 1, 1, 6853.69, -6851.976, 69.60109, 2.738199, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+5, 16349, 530, 1, 1, 6950.041, -6888.719, 49.80816, 3.477853, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+6, 16352, 530, 1, 1, 6878.636, -6864.466, 62.72943, 2.882877, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+7, 16349, 530, 1, 1, 6895.033, -6912.371, 47.20905, 4.118551, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+8, 16349, 530, 1, 1, 6922.021, -7040.709, 43.90837, 4.415325, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+9, 16352, 530, 1, 1, 6885.669, -7022.219, 48.7115, 1.793493, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+10, 16349, 530, 1, 1, 6897.135, -6971.594, 47.17694, 2.724053, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+11, 16352, 530, 1, 1, 6978.319, -7000.734, 51.0767, 4.078644, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+12, 16352, 530, 1, 1, 6942.256, -7020.499, 45.66068, 0.1648275, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+13, 16349, 530, 1, 1, 6984.509, -7047.863, 51.65011, 1.124614, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+14, 16349, 530, 1, 1, 6963.142, -7082.294, 49.01252, 6.261704, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+15, 16352, 530, 1, 1, 6890.896, -7106.758, 45.10302, 1.95221, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+16, 16349, 530, 1, 1, 6836.949, -6998.213, 89.5099, 3.035898, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+17, 16349, 530, 1, 1, 6963.359, -7153.403, 47.53667, 3.969122, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+18, 16352, 530, 1, 1, 6966.125, -7145.214, 49.57573, 5.950935, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+19, 16349, 530, 1, 1, 7039.774, -6724.048, 31.42106, 0.8247696, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+20, 16349, 530, 1, 1, 6894.136, -6637.756, 22.16779, 4.740626, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+21, 16352, 530, 1, 1, 6892.136, -6687.743, 33.33307, 6.265609, 120, 5, 1), -- 16352 (Area: 3433)
+(@CGUID+22, 16349, 530, 1, 1, 6862.79, -6653.266, 29.21497, 0.1569574, 120, 5, 1), -- 16349 (Area: 3433)
+(@CGUID+23, 16349, 530, 1, 1, 6795.933, -6674.067, 43.69128, 2.761438, 120, 5, 1); -- 16349 (Area: 3433)
+
+-- Set all of these creatures to roam 5 yards, and random movement type
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE id IN (16349,16352);
+
+UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `id`=9369;
+
+UPDATE `creature_template` SET `unit_flags`=537166656, `unit_flags2`=2048 WHERE `entry` IN (26737);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26737) AND `source_type`=0 AND `id`=6;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(26737,0,6,0,6,0,100,0,0,0,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,"Crazed Mana-Surge - On Just Died - Remove unit flag immune to pc");
+
+UPDATE `creature_template` SET `unit_flags`=0 WHERE `entry`=10161;
diff --git a/sql/updates/world/2015_09_11_18_world_from_335.sql b/sql/updates/world/2015_09_11_18_world_from_335.sql
new file mode 100644
index 0000000000..b0ffc1fb0c
--- /dev/null
+++ b/sql/updates/world/2015_09_11_18_world_from_335.sql
@@ -0,0 +1,11 @@
+--
+-- Removed useless conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (62290,62307,62357,62489,62635);
+-- Adjusted incorrect conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (62363,65044,65045);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition` ,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,2,62363,0,0,31,0,3,33214,0,0,0,'','Flame Leviathan - Anti-Air Rocket'),
+(13,1,65044,0,0,32,0,0x18, 0,0,0,0,'','Flame Leviathan - Flames'), -- should hit everything
+(13,2,65044,0,0,31,0,3,33090,0,0,0,'','Flame Leviathan - Flames'),
+(13,1,65045,0,0,32,0,0x18, 0,0,0,0,'','Flame Leviathan - Flames'), -- should hit everything
+(13,2,65045,0,0,31,0,3,33090,0,0,0,'','Flame Leviathan - Flames');
diff --git a/sql/updates/world/2015_09_11_19_world_from_335.sql b/sql/updates/world/2015_09_11_19_world_from_335.sql
new file mode 100644
index 0000000000..93cc2bbbfd
--- /dev/null
+++ b/sql/updates/world/2015_09_11_19_world_from_335.sql
@@ -0,0 +1,35 @@
+--
+/*
+SET @CGUID := 84210;
+SET @OLDCGUID := 370474;
+SET @OLDCGUID2 := 325984;
+ 
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+15;
+DELETE FROM `creature` WHERE `guid` BETWEEN @OLDCGUID+0 AND @OLDCGUID+15;
+DELETE FROM `creature` WHERE `guid` BETWEEN @OLDCGUID2+0 AND @OLDCGUID2+1;
+INSERT INTO `creature` (`guid`, `id`, `map`, `SpawnMask`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 20212, 642, 3, 0, 7.305609, -0.095246, 34.51022, 3.159046, 7200, 0, 0),
+(@CGUID+1, 20213, 641, 3, 0, 11.69965, 0.034146, 20.62076, 3.211406, 7200, 0, 0);
+ 
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+2, 37543, 530, 1, 1, 9633.195, -7136.578, 30.51368, 0, 120, 0, 0), -- 37543 (Area: 3665) 3.3.5a
+(@CGUID+3, 37543, 530, 1, 1, 9648.338, -7119.096, 28.47594, 0, 120, 0, 0), -- 37543 (Area: 3665) 3.3.5a
+(@CGUID+4, 37543, 530, 1, 1, 9665.38, -7136.049, 28.58942, 0, 120, 0, 0), -- 37543 (Area: 3665) 3.3.5a
+(@CGUID+5, 37574, 530, 1, 1, 9568.38, -7194.522, 24.68986, 4.660029, 120, 0, 0), -- 37574 (Area: 0) 3.3.5a
+(@CGUID+6, 37574, 530, 1, 1, 9530.643, -7189.838, 31.87009, 4.660029, 120, 0, 0), -- 37574 (Area: 0) 3.3.5a
+(@CGUID+7, 37543, 530, 1, 1, 9530.571, -7220.372, 30.44205, 1.22173, 120, 0, 0), -- 37543 (Area: 0) 3.3.5a
+(@CGUID+8, 37574, 530, 1, 1, 9520.098, -7188.818, 31.84313, 4.660029, 120, 0, 0), -- 37574 (Area: 0) 3.3.5a
+(@CGUID+9, 37574, 530, 1, 1, 9676.034, -7346.333, 22.96401, 4.660029, 120, 0, 0), -- 37574 (Area: 3482) 3.3.5a
+(@CGUID+10, 37574, 530, 1, 1, 9683.437, -7394.599, 24.14162, 4.660029, 120, 0, 0), -- 37574 (Area: 3482) 3.3.5a
+(@CGUID+11, 37574, 530, 1, 1, 9532.216, -7239.835, 24.74386, 4.660029, 120, 0, 0), -- 37574 (Area: 3482) 3.3.5a
+(@CGUID+12, 37574, 530, 1, 1, 9574.714, -7221.677, 23.17951, 4.660029, 120, 0, 0), -- 37574 (Area: 3482) 3.3.5a
+(@CGUID+13, 37543, 530, 1, 1, 9648.606, -7151.55, 28.7944, 0, 120, 0, 0), -- 37543 (Area: 3482) 3.3.5a
+(@CGUID+14, 37543, 530, 1, 1, 9467.849, -7269.604, 34.85052, 0, 120, 0, 0), -- 37543 (Area: 3482) 3.3.5a
+(@CGUID+15, 37543, 530, 1, 1, 9467.499, -7287.613, 36.13566, 0, 120, 0, 0); -- 37543 (Area: 3482) 3.3.5a
+ 
+DELETE FROM `creature_addon` WHERE `guid` IN (@CGUID, @CGUID+1);
+DELETE FROM `creature_addon` WHERE `guid` IN (@OLDCGUID2, @OLDCGUID2+1);
+INSERT INTO `creature_addon` (`guid`, `auras`) VALUES
+(@CGUID+0, 66656), -- Parachute
+(@CGUID+1, 66656); -- Parachute
+*/
diff --git a/sql/updates/world/2015_09_11_20_world_from_335.sql b/sql/updates/world/2015_09_11_20_world_from_335.sql
new file mode 100644
index 0000000000..c3a5bc4cdf
--- /dev/null
+++ b/sql/updates/world/2015_09_11_20_world_from_335.sql
@@ -0,0 +1,17 @@
+--
+-- Kvaldir Raider SAI
+SET @ENTRY := 25760;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,1,2000,2000,4000,4000,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kvaldir Raider - OOC - React passif"),
+(@ENTRY,0,1,0,1,0,100,1,3000,5000,4000,4000,17,375,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kvaldir Raider - OOC - Emote"),
+(@ENTRY,0,2,0,1,0,100,1,3000,3000,4000,4000,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kvaldir Raider - OOC - React Aggressif");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup` IN (1,2,3) AND `SourceEntry`=@ENTRY;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`,`NegativeCondition`) VALUES
+(22,1,@ENTRY,0,0,1,1,43671,1,0,0,"","Only Run script if the npc has the aura 43671",0),
+(22,2,@ENTRY,0,0,1,1,43671,1,0,0,"","Only Run script if the npc hasn't the aura 43671",1),
+(22,3,@ENTRY,0,0,1,1,43671,1,0,0,"","Only Run script if the npc hasn't the aura 43671",1);
+
+UPDATE `creature_template_addon` SET `emote`=0 WHERE `entry`=@ENTRY;
diff --git a/sql/updates/world/2015_09_11_21_world_from_335.sql b/sql/updates/world/2015_09_11_21_world_from_335.sql
new file mode 100644
index 0000000000..a14e8633c7
--- /dev/null
+++ b/sql/updates/world/2015_09_11_21_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `phaseMask`=1 WHERE `phaseMask`=65535;
diff --git a/sql/updates/world/2015_09_11_22_world_from_335.sql b/sql/updates/world/2015_09_11_22_world_from_335.sql
new file mode 100644
index 0000000000..c83de23b06
--- /dev/null
+++ b/sql/updates/world/2015_09_11_22_world_from_335.sql
@@ -0,0 +1,7 @@
+-- Waypoint fix for quest "Escape from the Winterfin Caverns" (11570)
+UPDATE `script_waypoint` SET `location_x`=4279.54, `location_y`=6187.932, `location_z`=0.294670 WHERE `entry`=25208 AND `pointid`=41;
+
+-- Swap 1st and 2nd text
+UPDATE `creature_text` SET `groupid` = 99 WHERE `entry` = 25208 AND `groupid` = 0  AND `id` = 0;
+UPDATE `creature_text` SET `groupid` = 0  WHERE `entry` = 25208 AND `groupid` = 1  AND `id` = 0;
+UPDATE `creature_text` SET `groupid` = 1  WHERE `entry` = 25208 AND `groupid` = 99 AND `id` = 0;
diff --git a/sql/updates/world/2015_09_11_23_world_from_335.sql b/sql/updates/world/2015_09_11_23_world_from_335.sql
new file mode 100644
index 0000000000..1b58aed1ab
--- /dev/null
+++ b/sql/updates/world/2015_09_11_23_world_from_335.sql
@@ -0,0 +1,7 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=47669;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `Comment`) VALUES
+(13, 1, 47669, 0, 1, 0, 48048, 0,0, "Awaken Subboss");
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 48048;
+INSERT INTO `spell_linked_spell` VALUES (48048, 47669, 0, 'Awaken Subboss');
diff --git a/sql/updates/world/2015_09_11_24_world_from_335.sql b/sql/updates/world/2015_09_11_24_world_from_335.sql
new file mode 100644
index 0000000000..2a66eb3390
--- /dev/null
+++ b/sql/updates/world/2015_09_11_24_world_from_335.sql
@@ -0,0 +1,5 @@
+-- 
+DELETE FROM `creature` WHERE `guid`=118724 AND `id`=27122;
+UPDATE `creature` SET `equipment_id`=1 WHERE `guid`=52290;
+UPDATE `creature_template_addon` SET `emote`=0 WHERE `entry`=26942;
+UPDATE `smart_scripts` SET `action_type`=11, `action_param1`=45491, `target_type`=19, `target_param1`=27180, `target_param2`=10, `comment`="Decrepit Necromancer - Out of Combat - Cast Necrotic Purple Beam" WHERE `entryorguid`=26942 AND `source_type`=0 AND `id`=0;
diff --git a/sql/updates/world/2015_09_11_25_world_from_335.sql b/sql/updates/world/2015_09_11_25_world_from_335.sql
new file mode 100644
index 0000000000..90eeee2e0e
--- /dev/null
+++ b/sql/updates/world/2015_09_11_25_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid`=137997 AND `id`=10319;
diff --git a/sql/updates/world/2015_09_11_26_world_from_335.sql b/sql/updates/world/2015_09_11_26_world_from_335.sql
new file mode 100644
index 0000000000..0f1a0348ef
--- /dev/null
+++ b/sql/updates/world/2015_09_11_26_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid`=208775 AND `id`=25958;
diff --git a/sql/updates/world/2015_09_11_27_world_from_335.sql b/sql/updates/world/2015_09_11_27_world_from_335.sql
new file mode 100644
index 0000000000..3baa80fbac
--- /dev/null
+++ b/sql/updates/world/2015_09_11_27_world_from_335.sql
@@ -0,0 +1,7 @@
+--
+DELETE FROM `creature` WHERE `guid`=201508 AND `id`=37824;
+DELETE FROM `creature` WHERE `guid`=201460 AND `id`=38228;
+DELETE FROM `creature` WHERE `guid`=201661 AND `id`=38228;
+DELETE FROM `creature` WHERE `guid`=201442 AND `id`=38231;
+DELETE FROM `creature` WHERE `guid`=201490 AND `id`=38232;
+DELETE FROM `creature` WHERE `guid`=201539 AND `id`=38232;
diff --git a/sql/updates/world/2015_09_11_28_world_from_335.sql b/sql/updates/world/2015_09_11_28_world_from_335.sql
new file mode 100644
index 0000000000..8e71742293
--- /dev/null
+++ b/sql/updates/world/2015_09_11_28_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid`=88282 AND `id`=18700;
diff --git a/sql/updates/world/2015_09_11_29_world_from_335.sql b/sql/updates/world/2015_09_11_29_world_from_335.sql
new file mode 100644
index 0000000000..9c4d4d9882
--- /dev/null
+++ b/sql/updates/world/2015_09_11_29_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid`=28649 AND `id`=17148;
diff --git a/sql/updates/world/2015_09_11_30_world_from_335.sql b/sql/updates/world/2015_09_11_30_world_from_335.sql
new file mode 100644
index 0000000000..3444afe1d7
--- /dev/null
+++ b/sql/updates/world/2015_09_11_30_world_from_335.sql
@@ -0,0 +1,5 @@
+-- 
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2546000 AND `source_type`=9 AND `id`=0 AND `action_type`=11;
+UPDATE `smart_scripts` SET `id`=0 WHERE `entryorguid`=2546000 AND `source_type`=9 AND `id`=1 AND `action_type`=53;
+
+DELETE FROM `creature_addon` WHERE `guid`=137997; -- fix a DB error
diff --git a/sql/updates/world/2015_09_11_31_world_from_335.sql b/sql/updates/world/2015_09_11_31_world_from_335.sql
new file mode 100644
index 0000000000..28736bdf78
--- /dev/null
+++ b/sql/updates/world/2015_09_11_31_world_from_335.sql
@@ -0,0 +1,6 @@
+-- 
+UPDATE `creature_template` SET `spell1`=49297 WHERE `entry` IN (27664,40281);
+DELETE FROM `creature_template_addon` WHERE `entry` IN (27664,40281);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(27664,0,0,0,0,0,'49384'),
+(40281,0,0,0,0,0,'75110');
diff --git a/sql/updates/world/2015_09_11_32_world_from_335.sql b/sql/updates/world/2015_09_11_32_world_from_335.sql
new file mode 100644
index 0000000000..6034ea9a60
--- /dev/null
+++ b/sql/updates/world/2015_09_11_32_world_from_335.sql
@@ -0,0 +1,4 @@
+-- 
+/*
+UPDATE `item_template` SET `socketcolor_1` = 4 WHERE `entry` = 44176;
+*/
\ No newline at end of file
diff --git a/sql/updates/world/2015_09_11_33_world_from_335.sql b/sql/updates/world/2015_09_11_33_world_from_335.sql
new file mode 100644
index 0000000000..516d2245f3
--- /dev/null
+++ b/sql/updates/world/2015_09_11_33_world_from_335.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature_template_addon` SET `mount`=21158 WHERE `entry`=22980;
diff --git a/sql/updates/world/2015_09_11_34_world_from_335.sql b/sql/updates/world/2015_09_11_34_world_from_335.sql
new file mode 100644
index 0000000000..5394299e73
--- /dev/null
+++ b/sql/updates/world/2015_09_11_34_world_from_335.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `spell_proc_event` SET `Cooldown`=45 WHERE `entry`=64786;
diff --git a/sql/updates/world/2015_09_11_35_world_from_335.sql b/sql/updates/world/2015_09_11_35_world_from_335.sql
new file mode 100644
index 0000000000..c499b5a71c
--- /dev/null
+++ b/sql/updates/world/2015_09_11_35_world_from_335.sql
@@ -0,0 +1,10 @@
+-- 
+SET @ENTRY := 3584;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`>=5;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,5,7,61,0,100,0,945,0,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,"Therylune - On Quest 'Therylune's Escape' Taken - Set Faction 250"),
+(@ENTRY,0,6,8,11,0,100,0,0,0,0,0,2,124,0,0,0,0,0,1,0,0,0,0,0,0,0,"Therylune - On Respawn - Set Faction 124"),
+(@ENTRY,0,7,9,61,0,100,0,0,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,"Therylune - On Quest 'Therylune's Escape' Taken - Remove Flags Immune To NPC's"),
+(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0,"Therylune - On Respawn - Set Flags Immune To NPC's"),
+(@ENTRY,0,9,0,61,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Therylune - On Quest 'Therylune's Escape' Taken - Remove npc flag");
+UPDATE `smart_scripts` SET `link`=5 WHERE  `entryorguid`=3584 AND `source_type`=0 AND `id`=1 AND `link`=0;
diff --git a/sql/updates/world/2015_09_11_36_world_from_335.sql b/sql/updates/world/2015_09_11_36_world_from_335.sql
new file mode 100644
index 0000000000..2e67495733
--- /dev/null
+++ b/sql/updates/world/2015_09_11_36_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid`=151994 AND `id`=32475;
diff --git a/sql/updates/world/2015_09_11_37_world_from_335.sql b/sql/updates/world/2015_09_11_37_world_from_335.sql
new file mode 100644
index 0000000000..e9c3f9884a
--- /dev/null
+++ b/sql/updates/world/2015_09_11_37_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid`=134518 AND `id`=23810;
diff --git a/sql/updates/world/2015_09_11_38_world_from_335.sql b/sql/updates/world/2015_09_11_38_world_from_335.sql
new file mode 100644
index 0000000000..9b96e3a43f
--- /dev/null
+++ b/sql/updates/world/2015_09_11_38_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid`=123124 AND `id`=32769;
diff --git a/sql/updates/world/2015_09_11_39_world_from_335.sql b/sql/updates/world/2015_09_11_39_world_from_335.sql
new file mode 100644
index 0000000000..33509c700c
--- /dev/null
+++ b/sql/updates/world/2015_09_11_39_world_from_335.sql
@@ -0,0 +1,3 @@
+--
+DELETE FROM `creature` WHERE `guid`=120833 AND `id`=32769;
+DELETE FROM `creature` WHERE `guid`=120831 AND `id`=32769;
diff --git a/sql/updates/world/2015_09_11_40_world_from_335.sql b/sql/updates/world/2015_09_11_40_world_from_335.sql
new file mode 100644
index 0000000000..a259ae99f2
--- /dev/null
+++ b/sql/updates/world/2015_09_11_40_world_from_335.sql
@@ -0,0 +1,335 @@
+-- 
+SET @GUID := 52011;  -- 11 FREE CGUID SET BY TC
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID + 10; 
+INSERT INTO `creature` (`guid`, `id`, `map`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `curhealth`) VALUES
+(@GUID + 0, 24833, 584, 22659, 26.68381, 5.156456, 11.14973, 1.562181, 1474), -- Captain "Stash" Torgoley <The Lady Mehley> - 75958
+(@GUID + 1, 24834, 584, 22660, 17.73618, -7.963644, 6.181007, 1.658063, 1474), -- Galley Chief Grace <The Lady Mehley> - 75959
+(@GUID + 2, 24835, 584, 22661, 24.61499, 5.468628, 16.04766, 3.176499, 1358), -- First Mate Kowalski <The Lady Mehley> - 75960
+(@GUID + 3, 24836, 584, 262, -4.359131, 3.349854, 6.099176, 1.576669, 312), -- Abe the Cabin Boy <The Lady Mehley> - 75961
+(@GUID + 4, 24837, 584, 22662, 19.20459, -7.213135, 6.097228, 3.667171, 867), -- Navigator Mehran <The Lady Mehley> - 75962
+(@GUID + 5, 24838, 584, 22663, -27.50586, -3.588379, 21.17929, 2.405203, 804), -- Sailor Henders <The Lady Mehley>  - 75963
+(@GUID + 6, 24839, 584, 22664, 6.123779, 10.77246, 11.47038, 1.539951, 804), -- Sailor Wicks <The Lady Mehley> - 75964
+(@GUID + 7, 24840, 584, 22665, 28.74146, 6.708008, 6.096051, 1.087228, 804), -- Sailor Vines <The Lady Mehley> - 75965
+(@GUID + 8, 24841, 584, 1858, -9.322998, -1.669921, 6.09808, 0.01745319, 10236), -- Marine Halters - 75966
+(@GUID + 9, 24842, 584, 22666, 14.44629, 0.1442871, 12.0214, 3.309605, 10236), -- Marine Anderson - 75967
+(@GUID + 10, 24843, 584, 22667, 6.350558, 8.718207, 6.180843, 5.427974, 928); -- Engineer Combs <The Lady Mehley> - 75968
+
+-- Pathing for  Entry: 24833 'TDB FORMAT' 
+SET @NPC := @GUID;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=37.03026,`position_y`=4.622362,`position_z`=6.176411, `orientation`=1.00 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,1,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,37.03026,4.622362,6.176411,1.00,35000,0,0,100,0),
+(@PATH,2,33.79711,3.379296,6.136233,0,0,0,0,100,0),
+(@PATH,3,30.11437,1.977602,6.346729,0,0,0,0,100,0),
+(@PATH,4,28.86437,2.977602,6.346729,0,0,0,0,100,0),
+(@PATH,5,26.34205,5.299405,6.347331,0,0,0,0,100,0),
+(@PATH,6,23.84205,5.299405,6.347331,0,0,0,0,100,0),
+(@PATH,7,17.09205,5.049405,6.347331,0,0,0,0,100,0),
+(@PATH,8,10.25663,4.995337,6.348217,0,0,0,0,100,0),
+(@PATH,9,7.917565,0.5690584,6.348763,0,0,0,0,100,0),
+(@PATH,10,8.917565,-0.9309416,6.348763,0,0,0,0,100,0),
+(@PATH,11,11.10869,-4.599314,6.348672,0,0,0,0,100,0),
+(@PATH,12,18.60869,-4.849314,6.348672,0,0,0,0,100,0),
+(@PATH,13,24.60869,-5.099314,6.348672,0,0,0,0,100,0),
+(@PATH,14,26.69126,-5.140297,6.623405,0,0,0,0,100,0),
+(@PATH,15,26.69126,-3.640297,6.623405,0,0,0,0,100,0),
+(@PATH,16,26.69126,3.859703,11.3734,0,0,0,0,100,0),
+(@PATH,17,26.56619,3.997062,11.49595,0,0,0,0,100,0),
+(@PATH,18,26.56619,5.497062,11.49595,0,0,0,0,100,0),
+(@PATH,19,24.06619,5.497062,11.49595,0,0,0,0,100,0),
+(@PATH,20,22.81619,5.497062,11.99595,0,0,0,0,100,0),
+(@PATH,21,21.56619,5.497062,12.24595,0,0,0,0,100,0),
+(@PATH,22,5.473877,5.844482,11.85669,0,25000,0,0,100,0),
+(@PATH,23,7.723877,-1.405518,11.85669,0,0,0,0,100,0),
+(@PATH,24,10.47388,-6.155518,11.85669,0,0,0,0,100,0),
+(@PATH,25,10.43553,-5.953337,11.88334,0,0,0,0,100,0),
+(@PATH,26,10.93553,-6.953337,11.88334,0,0,0,0,100,0),
+(@PATH,27,5.371088,-7.016384,11.77661,0,0,0,0,100,0),
+(@PATH,28,2.413238,-4.390701,11.56228,0,0,0,0,100,0),
+(@PATH,29,1.163238,-4.390701,11.31228,0,0,0,0,100,0),
+(@PATH,30,-3.086762,-5.140701,6.562281,0,0,0,0,100,0);
+-- 0x1C15A0002018404000004000006049B5 .go 37.03026 4.622362 6.176411
+
+-- Pathing for  Entry: 24835 'TDB FORMAT' 
+SET @NPC := @GUID + 2;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=24.61543,`position_y`=5.468647,`position_z`=16.12396 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,24.61543,5.468647,16.12396,3.246287,0,0,0,100,0),
+(@PATH,2,24.59153,3.553659,16.31282,0,0,0,0,100,0),
+(@PATH,3,24.59153,0.05365944,16.31282,0,0,0,0,100,0),
+(@PATH,4,24.59153,-3.446341,16.06282,0,0,0,0,100,0),
+(@PATH,5,24.57548,-5.133168,16.0891,0,0,0,0,100,0),
+(@PATH,6,23.32548,-5.383168,16.0891,0,0,0,0,100,0),
+(@PATH,7,20.07548,-5.883168,12.5891,0,0,0,0,100,0),
+(@PATH,8,19.97622,-5.8692,12.62369,0,0,0,0,100,0),
+(@PATH,9,19.22622,-5.8692,12.62369,0,0,0,0,100,0),
+(@PATH,10,18.97622,-4.6192,12.62369,0,0,0,0,100,0),
+(@PATH,11,17.54005,-0.2464206,12.32892,0,0,0,0,100,0),
+(@PATH,12,18.04005,3.753579,12.32892,0,0,0,0,100,0),
+(@PATH,13,18.07397,3.926754,12.37037,0,0,0,0,100,0),
+(@PATH,14,18.32397,5.676754,12.12037,0,0,0,0,100,0),
+(@PATH,15,20.28442,3.827637,12.37757,0,0,0,0,100,0),
+(@PATH,16,19.53442,-0.1723633,12.37757,0,0,0,0,100,0),
+(@PATH,17,19.03442,-4.672363,12.12757,0,0,0,0,100,0),
+(@PATH,18,18.88482,-4.669163,12.44052,0,0,0,0,100,0),
+(@PATH,19,18.88482,-5.669163,12.44052,0,0,0,0,100,0),
+(@PATH,20,20.13482,-5.669163,12.69052,0,0,0,0,100,0),
+(@PATH,21,23.13482,-5.169163,15.94052,0,0,0,0,100,0),
+(@PATH,22,25.75478,-4.782483,16.3373,0,0,0,0,100,0),
+(@PATH,23,25.75478,-3.282483,16.3373,0,0,0,0,100,0),
+(@PATH,24,26.00478,-0.03248262,16.5873,0,0,0,0,100,0),
+(@PATH,25,26.25478,3.467517,16.5873,0,0,0,0,100,0),
+(@PATH,26,24.61548,5.46875,16.04771,0,0,0,0,100,0),
+(@PATH,27,24.61548,5.46875,16.04771,3.176499,80000,0,0,100,0);
+-- 0x1C15A000201840C000004000006048CF .go 24.61543 5.468647 16.12396
+
+-- Pathing for  Entry: 24836 'TDB FORMAT' 
+SET @NPC := @GUID + 3;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-2.233398,`position_y`=2.553833,`position_z`=6.099016 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-2.233398,2.553833,6.099016,0,0,0,0,100,0),
+(@PATH,2,-2.233398,2.553833,6.099016,2.059489,0,0,0,100,0),
+(@PATH,3,1.698853,3.417053,6.348891,0,0,0,0,100,0),
+(@PATH,4,3.448853,4.167053,6.348891,0,0,0,0,100,0),
+(@PATH,5,7.448853,-0.5829468,6.348891,0,0,0,0,100,0),
+(@PATH,6,9.774704,-2.902952,6.349678,0,0,0,0,100,0),
+(@PATH,7,9.800768,-3.249776,6.348591,0,0,0,0,100,0),
+(@PATH,8,13.55077,-3.999776,6.348591,0,0,0,0,100,0),
+(@PATH,9,18.30077,-4.749776,6.348591,0,0,0,0,100,0),
+(@PATH,10,20.13506,-5.121357,6.347137,0,0,0,0,100,0),
+(@PATH,11,24.38506,-5.371357,6.347137,0,0,0,0,100,0),
+(@PATH,12,24.58777,-5.452598,6.623333,0,0,0,0,100,0),
+(@PATH,13,26.83777,-5.702598,6.623333,0,0,0,0,100,0),
+(@PATH,14,26.58777,-3.452598,6.623333,0,0,0,0,100,0),
+(@PATH,15,26.58777,3.797402,11.37333,0,0,0,0,100,0),
+(@PATH,16,26.85096,4.066658,11.19734,0,0,0,0,100,0),
+(@PATH,17,26.85096,5.566658,11.19734,0,0,0,0,100,0),
+(@PATH,18,26.86504,5.718296,11.3996,0,0,0,0,100,0),
+(@PATH,19,30.61504,5.718296,11.3996,0,0,0,0,100,0),
+(@PATH,20,30.61504,3.718296,11.3996,0,0,0,0,100,0),
+(@PATH,21,29.54675,3.707764,11.3996,0,0,0,0,100,0),
+(@PATH,22,28.29675,4.207764,11.3996,0,0,0,0,100,0),
+(@PATH,23,24.39871,5.605234,11.61975,0,0,0,0,100,0),
+(@PATH,24,23.39871,5.605234,11.61975,0,0,0,0,100,0),
+(@PATH,25,22.14871,5.605234,12.11975,0,0,0,0,100,0),
+(@PATH,26,21.82304,5.810547,12.27328,0,0,0,0,100,0),
+(@PATH,27,20.07304,5.810547,12.27328,0,0,0,0,100,0),
+(@PATH,28,17.32304,3.810547,12.27328,0,0,0,0,100,0),
+(@PATH,29,17.06653,3.683082,12.10866,0,0,0,0,100,0),
+(@PATH,30,14.56653,1.933082,12.10866,0,0,0,0,100,0),
+(@PATH,31,13.06653,-1.066918,12.10866,0,0,0,0,100,0),
+(@PATH,32,9.639757,-6.127687,11.82736,0,0,0,0,100,0),
+(@PATH,33,3.298409,-6.022044,11.54611,0,0,0,0,100,0),
+(@PATH,34,2.798409,-4.272044,11.54611,0,0,0,0,100,0),
+(@PATH,35,1.048409,-4.522044,11.29611,0,0,0,0,100,0),
+(@PATH,36,-2.951591,-5.022044,6.546112,0,0,0,0,100,0),
+(@PATH,37,-4.002031,-4.848095,6.186443,0,0,0,0,100,0),
+(@PATH,38,-4.002031,-0.0980947,6.186443,0,0,0,0,100,0),
+(@PATH,39,-2.233643,2.553955,6.099016,0,0,0,0,100,0);
+-- 0x1C15A0000018410000002F0000604858 .go -2.233398 2.553833 6.099016
+
+-- Pathing for  Entry: 24837 'TDB FORMAT' 
+SET @NPC := @GUID + 4;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=21.28821,`position_y`=-6.498474,`position_z`=6.346781 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,21.28821,-6.498474,6.346781,0,0,0,0,100,0),
+(@PATH,2,24.28821,-6.248474,6.346781,0,0,0,0,100,0),
+(@PATH,3,24.5675,-5.887867,6.623326,0,0,0,0,100,0),
+(@PATH,4,26.3175,-5.637867,6.623326,0,0,0,0,100,0),
+(@PATH,5,26.5675,-3.637867,6.623326,0,0,0,0,100,0),
+(@PATH,6,26.8175,3.862133,11.37333,0,0,0,0,100,0),
+(@PATH,7,27.0207,5.456285,11.61129,0,0,0,0,100,0),
+(@PATH,8,24.0207,5.456285,11.61129,0,0,0,0,100,0),
+(@PATH,9,22.7707,5.706285,11.86129,0,0,0,0,100,0),
+(@PATH,10,21.5207,5.706285,12.36129,0,0,0,0,100,0),
+(@PATH,11,21.19737,5.743245,12.28643,0,0,0,0,100,0),
+(@PATH,12,19.69737,5.743245,12.28643,0,0,0,0,100,0),
+(@PATH,13,18.44737,3.743245,12.28643,0,0,0,0,100,0),
+(@PATH,14,16.32088,0.3530575,12.37261,0,0,0,0,100,0),
+(@PATH,15,18.57088,-4.646943,12.37261,0,0,0,0,100,0),
+(@PATH,16,18.82599,-4.72204,12.55197,0,0,0,0,100,0),
+(@PATH,17,19.32599,-5.72204,12.55197,0,0,0,0,100,0),
+(@PATH,18,23.32599,-5.22204,16.05197,0,0,0,0,100,0),
+(@PATH,19,24.89713,-4.957284,16.51354,0,0,0,0,100,0),
+(@PATH,20,27.89713,-4.707284,17.01354,0,0,0,0,100,0),
+(@PATH,21,35.14713,-3.957284,18.26354,0,0,0,0,100,0),
+(@PATH,22,35.03859,-3.71197,18.26312,0,0,0,0,100,0),
+(@PATH,23,35.53859,-3.71197,18.51312,0,0,0,0,100,0),
+(@PATH,24,36.03859,-2.71197,18.51312,0,0,0,0,100,0),
+(@PATH,25,36.78859,-1.21197,18.51312,0,0,0,0,100,0),
+(@PATH,26,36.83167,-1.03315,18.61353,0,0,0,0,100,0),
+(@PATH,27,37.33167,-0.0331502,18.61353,0,0,0,0,100,0),
+(@PATH,28,35.83167,-0.0331502,18.36353,0,0,0,0,100,0),
+(@PATH,29,33.81982,0.05114746,18.28621,0,80000,0,0,100,0);
+-- 0x1C15A0000018414000002F0000604858 .go 21.28821 -6.498474 6.346781
+
+-- Pathing for  Entry: 24838 'TDB FORMAT' 
+SET @NPC := @GUID + 5;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-27.21704,`position_y`=-0.001220703,`position_z`=21.58302 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-27.21704,-0.001220703,21.58302,3.141593,15000,0,0,100,0),
+(@PATH,2,-26.7854,3.492676,21.49658,0,0,0,0,100,0),
+(@PATH,3,-27.21509,0.02246094,21.582,0,0,0,0,100,0),
+(@PATH,4,-27.21509,0.02246094,21.582,3.141593,15000,0,0,100,0),
+(@PATH,5,-27.31982,-3.39917,21.29024,0,0,0,0,100,0),
+(@PATH,6,-23.06238,-6.165868,20.58522,0,0,0,0,100,0);
+-- 0x1C15A0000018418000002F0000604859 .go -27.21704 -0.001220703 21.58302
+
+-- Pathing for  Entry: 24839 'TDB FORMAT' 
+SET @NPC := @GUID + 6;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=9.595876,`position_y`=-1.214922,`position_z`=11.80095 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,9.595876,-1.214922,11.80095,0,10000,0,0,100,0),
+(@PATH,2,10.84588,3.285078,12.05095,0,0,0,0,100,0),
+(@PATH,3,10.78306,3.165822,11.99681,0,0,0,0,100,0),
+(@PATH,4,11.03306,4.415822,11.99681,0,0,0,0,100,0),
+(@PATH,5,9.130737,-1.28125,11.96241,0,0,0,0,100,0),
+(@PATH,6,9.877741,-6.322785,11.91132,0,0,0,0,100,0),
+(@PATH,7,6.444749,-7.275679,11.82178,0,0,0,0,100,0),
+(@PATH,8,6.444749,-9.525679,11.57178,0,0,0,0,100,0),
+(@PATH,9,7.006714,-9.58252,11.59527,0,0,0,0,100,0),
+(@PATH,10,8.256714,-8.08252,11.84527,0,10000,0,0,100,0),
+(@PATH,11,9.506714,-6.58252,11.84527,0,0,0,0,100,0),
+(@PATH,12,9.757862,-6.227444,12.01764,0,0,0,0,100,0),
+(@PATH,13,10.25786,-5.227444,11.76764,0,0,0,0,100,0),
+(@PATH,14,11.50786,-1.227444,12.01764,0,0,0,0,100,0),
+(@PATH,15,10.53357,-1.442627,12.06874,0,0,0,0,100,0),
+(@PATH,16,9.107422,-2.769531,11.71875,3.385939,10000,0,0,100,0),
+(@PATH,17,9.595581,-1.214111,11.99324,0,0,0,0,100,0),
+(@PATH,18,10.84558,3.285889,11.99324,0,0,0,0,100,0),
+(@PATH,19,10.78296,3.167067,11.99682,0,0,0,0,100,0),
+(@PATH,20,11.03296,4.417067,11.99682,0,10000,0,0,100,0);
+-- 0x1C15A000201841C000004000006049B5 .go 9.595876 -1.214922 11.80095
+
+-- Pathing for  Entry: 24840 'TDB FORMAT' 
+SET @NPC := @GUID + 7;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-12.18092,`position_y`=5.488965,`position_z`=6.140242 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-12.18092,5.488965,6.140242,0,0,0,0,100,0),
+(@PATH,2,-11.93092,4.238965,6.140242,0,0,0,0,100,0),
+(@PATH,3,1.66333,3.382568,6.347836,0,0,0,0,100,0),
+(@PATH,4,3.41333,4.132568,6.347836,0,0,0,0,100,0),
+(@PATH,5,16.41333,5.132568,6.347836,0,0,0,0,100,0),
+(@PATH,6,23.91333,5.632568,6.347836,0,0,0,0,100,0),
+(@PATH,7,27.02629,5.782645,6.348631,0,0,0,0,100,0),
+(@PATH,8,28.7417,6.706543,6.096051,0,0,0,0,100,0),
+(@PATH,9,23.86475,6.410645,6.347143,0,0,0,0,100,0),
+(@PATH,10,18.36475,6.160645,6.347143,0,0,0,0,100,0),
+(@PATH,11,16.61475,5.910645,6.347143,0,0,0,0,100,0),
+(@PATH,12,15.36475,5.910645,6.347143,0,0,0,0,100,0),
+(@PATH,13,3.364746,5.410645,6.347143,0,0,0,0,100,0),
+(@PATH,14,3.131845,5.415648,6.349216,0,0,0,0,100,0),
+(@PATH,15,1.881845,5.415648,6.349216,0,0,0,0,100,0),
+(@PATH,16,-8.868155,6.665648,6.349216,0,0,0,0,100,0),
+(@PATH,17,-9.868155,6.915648,6.349216,0,0,0,0,100,0),
+(@PATH,18,-12.56714,7.07666,6.098746,0,0,0,0,100,0),
+(@PATH,19,-12.56714,7.07666,6.098746,3.525565,0,0,0,100,0),
+(@PATH,20,-12.18091,5.489014,6.348577,0,0,0,0,100,0),
+(@PATH,21,-11.93091,4.239014,6.348577,0,0,0,0,100,0),
+(@PATH,22,1.663208,3.382813,6.347836,0,0,0,0,100,0),
+(@PATH,23,3.413208,4.132813,6.347836,0,0,0,0,100,0),
+(@PATH,24,16.41321,5.132813,6.347836,0,0,0,0,100,0),
+(@PATH,25,23.91321,5.632813,6.347836,0,0,0,0,100,0);
+-- 0x1C15A0002018420000004000006049B5 .go -12.18092 5.488965 6.140242
+
+-- Pathing for  Entry: 24842 'TDB FORMAT' 
+SET @NPC := @GUID + 9;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=20.11769,`position_y`=-6.318613,`position_z`=6.388871 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,20.11769,-6.318613,6.388871,0,0,0,0,100,0),
+(@PATH,2,24.36769,-6.068613,6.138871,0,0,0,0,100,0),
+(@PATH,3,26.54725,-5.752126,6.622897,0,0,0,0,100,0),
+(@PATH,4,26.54725,-3.502126,6.622897,0,0,0,0,100,0),
+(@PATH,5,26.79725,3.747874,11.3729,0,0,0,0,100,0),
+(@PATH,6,26.79725,5.497874,11.3729,0,0,0,0,100,0),
+(@PATH,7,26.84597,3.878396,11.42881,0,0,0,0,100,0),
+(@PATH,8,26.84597,5.378396,11.42881,0,0,0,0,100,0),
+(@PATH,9,26.84597,6.128396,11.42881,0,0,0,0,100,0),
+(@PATH,10,24.09597,5.878396,11.42881,0,0,0,0,100,0),
+(@PATH,11,22.59597,5.878396,11.92881,0,0,0,0,100,0),
+(@PATH,12,21.59597,5.878396,12.42881,0,0,0,0,100,0),
+(@PATH,13,21.2122,5.86385,12.2945,0,0,0,0,100,0),
+(@PATH,14,18.7122,5.61385,12.2945,0,0,0,0,100,0),
+(@PATH,15,17.7122,3.61385,12.2945,0,0,0,0,100,0),
+(@PATH,16,14.01855,0.09912109,12.00374,0,0,0,0,100,0),
+(@PATH,17,15.29224,0.3544922,12.05542,0,0,0,0,100,0),
+(@PATH,18,14.146,0.02685547,12.00965,0,0,0,0,100,0),
+(@PATH,19,20.63428,3.088379,12.32969,0,0,0,0,100,0),
+(@PATH,20,21.63428,4.088379,12.07969,0,0,0,0,100,0),
+(@PATH,21,23.38428,4.838379,11.57969,0,0,0,0,100,0),
+(@PATH,22,26.57771,5.543217,11.23778,0,0,0,0,100,0),
+(@PATH,23,26.57771,3.793216,11.23778,0,0,0,0,100,0),
+(@PATH,24,26.32771,-3.456784,6.487778,0,0,0,0,100,0),
+(@PATH,25,26.43777,-3.82635,6.296148,0,0,0,0,100,0),
+(@PATH,26,26.43777,-5.32635,6.296148,0,0,0,0,100,0),
+(@PATH,27,24.43777,-5.32635,6.296148,0,0,0,0,100,0),
+(@PATH,28,19.93777,-5.57635,6.296148,0,0,0,0,100,0),
+(@PATH,29,6.767334,-6.272217,6.347435,0,0,0,0,100,0),
+(@PATH,30,6.116943,-6.608887,6.097135,2.286381,10000,0,0,100,0);
+-- 0x1C15A0002018428000004000006049B5 .go 20.11769 -6.318613 6.388871
+
+SET @Sailor := 24838;
+SET @Kowalski := 24835;
+SET @Mehran := 24837;
+SET @Stash := 24833;
+-- Add text
+DELETE FROM `creature_text` WHERE `entry` IN (@Sailor, @Kowalski, @Mehran, @Stash);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
+(@Sailor, 0, 0, 'Land ho, Mr. Kowalski! Port is in sight, sir!', 12, 7, 100, 0, 0, 0, 'Sailor Henders', 23941),
+(@Kowalski, 0, 0, 'Thank you, Mr. Henders.', 12, 7, 100, 0, 0, 0, 'First Mate Kowalski', 23942),
+(@Kowalski, 1, 0, 'Bring us into port, please, Mr. Mehran.', 12, 7, 100, 0, 0, 0, 'First Mate Kowalski', 23943),
+(@Mehran, 0, 0, 'Aye aye, Mr. Kowalski.', 12, 0, 100, 0, 0, 0, 'Navigator Mehran', 23951),
+(@Kowalski, 2, 0, 'Captain Stash! We''ll be arriving shortly, sir!', 12, 7, 100, 0, 0, 0, 'First Mate Kowalski', 23944),
+(@Stash, 0, 0, 'Thank you, Mr. Kowalski! You may return to your post to oversee docking!', 12, 7, 100, 0, 0, 0, 'Captain "Stash" Torgoley', 23945),
+(@Stash, 1, 0, 'Well done, all. Please bring us safely to our next port. ', 12, 7, 100, 0, 0, 0, 'Captain "Stash" Torgoley', 23946);
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@Sailor, @Kowalski, @Mehran, @Stash);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Sailor AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Stash AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Kowalski AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Stash*100 AND `source_type`=9;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Kowalski*100 AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@Sailor,0,0,0,25,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sailor - on reset - Say Line 0"),
+(@Stash,0,0,0,25,0,100,0,0,0,0,0,80,@Stash*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stash - on reset - action list"),
+(@Stash*100,9,0,0,0,0,100,0,36000,36000,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stash - action list - Stand up"),
+(@Stash*100,9,1,0,0,0,100,0,49000,49000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stash - action list - Say Line 1"),
+(@Stash*100,9,2,0,0,0,100,0,0,0,0,0,5,21,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stash - action list - Play emote applaud"),
+(@Kowalski,0,0,0,25,0,100,0,0,0,0,0,80,@Kowalski*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kowalski - On reset - Action list"),
+(@Kowalski*100,9,0,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kowalski- ooc los - Say Line 0"),
+(@Kowalski*100,9,1,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,40,0,0,0,0,0,"Kowalski - ooc los - Say Line 1"),
+(@Kowalski*100,9,2,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,@Mehran,40,0,0,0,0,0,"Kowalski- ooc los - Say Line 0"),
+(@Kowalski*100,9,3,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kowalski - ooc los - Say Line 2"),
+(@Kowalski*100,9,4,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,19,@Stash,40,0,0,0,0,0,"Kowalski - ooc los - Say Line 0");
diff --git a/sql/updates/world/2015_09_11_41_world_from_335.sql b/sql/updates/world/2015_09_11_41_world_from_335.sql
new file mode 100644
index 0000000000..cabdd4b905
--- /dev/null
+++ b/sql/updates/world/2015_09_11_41_world_from_335.sql
@@ -0,0 +1,6 @@
+-- 
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21719 AND `source_type`=0 AND `id`=15;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21720 AND `source_type`=0 AND `id`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21717 AND `source_type`=0 AND `id`=3;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21718 AND `source_type`=0 AND `id`=13;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22331 AND `source_type`=0 AND `id`=20;
diff --git a/sql/updates/world/2015_09_11_42_world_335.sql b/sql/updates/world/2015_09_11_42_world_335.sql
new file mode 100644
index 0000000000..4f0341a212
--- /dev/null
+++ b/sql/updates/world/2015_09_11_42_world_335.sql
@@ -0,0 +1,112 @@
+-- 
+/*
+UPDATE `creature` SET `spawntimesecs`=60 WHERE `guid`=50005;
+
+-- Kindal Moonweaver SAI
+SET @ENTRY := 7956;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=795601 AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,19,0,100,0,2969,0,0,0,29,4,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Start Follow Invoker"),
+(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Remove Flag Standstate Kneel"),
+(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,2,774,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Set Faction 774"),
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Say Line 0"),
+(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Remove unit flag 512"),
+(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Remove npcflag 2"),
+(@ENTRY,0,6,7,61,0,100,0,0,0,0,0,8,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - React def"),
+(@ENTRY,0,7,8,61,0,100,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Store target"),
+(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,41,360000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Despawn In 360000 ms"),
+(@ENTRY,0,9,0,4,0,100,0,0,0,0,0,1,1,0,1,0,0,0,7,0,0,0,0,0,0,0,"Kindal Moonweaver - On Aggro - Say Line 1"),
+(@ENTRY,0,10,0,38,0,100,1,1,1,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Data Set 1 1 - Action list"),
+(@ENTRY,0,11,0,7,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Evade - Set stand state"),
+(@ENTRY,0,12,0,77,0,100,0,1,5,0,0,80,795601,2,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On counter=5 - Action ist"),
+(795601,9,0,0,0,0,100,0,1000,1000,0,0,1,3,0,0,0,0,0,12,1,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Say Line 3"),
+(795601,9,1,0,0,0,100,0,0,0,0,0,6,2969,0,0,0,0,0,18,20,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Quest fails"),
+(795601,9,2,0,0,0,100,0,3000,3000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Despawn");
+
+-- Actionlist SAI
+SET @ENTRY := 795600;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Say Line 2"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,15,2969,0,0,0,0,0,18,20,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Quest Credit 'Freedom for All Creatures'"),
+(@ENTRY,9,2,0,0,0,100,0,5000,5000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Despawn In 3000 ms");
+
+/* Script for the Door, it will start the event for the creatures */
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=143979;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=143979;
+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
+(143979, 1, 0, 0, 70, 0, 100, 0, 2, 0, 0, 0, 80, 143979*100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'bambus door - On activate - start script');
+-- Actionlist SAI
+SET @ENTRY := 14397900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,11,7997,20,0,0,0,0,0,"On Script - Set Data 1 1");
+
+-- Captured Sprite Darter SAI 
+SET @ENTRY := 7997;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,80,@ENTRY*100,2,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Sprite Darter - On Data Set 1 1 - Run Script"),
+(@ENTRY,0,1,2,40,0,100,0,13,7997,0,0,45,1,1,0,0,0,0,19,7956,50,0,0,0,0,0,"Captured Sprite Darter - On Waypoint 13 Reached - Set Data 1 1"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Sprite Darter - On Waypoint 13 Reached - Despawn In 3s"),
+(@ENTRY,0,3,0,11,0,100,0,0,0,0,0,2,534,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Sprite Darter - On Respawn - Set Faction 534"),
+(@ENTRY,0,4,0,6,0,100,0,0,0,0,0,63,1,1,0,0,0,0,19,7956,50,0,0,0,0,0,"Captured Sprite Darter - On Death  - set counter");
+
+/* Call script for waypoint-start */
+
+-- Actionlist SAI
+SET @ENTRY := 799700;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,53,0,7997,0,0,0,1,1,0,0,0,0,0,0,0,"On Script - Start Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,100,100,0,0,2,774,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Sprite Darter - On Script - Set Faction 774");
+
+/* Texts for Kindal Moonweaver */
+DELETE FROM `creature_text` WHERE `entry` in (7956);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextId`) VALUES 
+(7956, 0, 0, 'I''m ready when you are, $n. Lead the way!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4079),
+(7956, 1, 0, 'Die, $n. Elune will not have you harm her creatures any longer!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4123),
+(7956, 1, 1, 'You dare touch me?!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4125),
+(7956, 1, 2, 'Death to you, $n. How dare you come within a bow''s shot of me!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4124),
+(7956, 1, 3, 'Quickly! $n attacks!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4122),
+(7956, 2, 0, 'We\'ve done it! Meet me back by Jer\'kai above the Grim Totem camp.', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4080),
+(7956, 3, 0, 'No! The faerie dragons aren''t making it, $n! I must return to Jer''kai to make sure she hasn''t been found. Elune be with you.', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4081);
+
+/* Waypoints for Captured Sprite Darter */
+DELETE FROM `waypoints` WHERE `entry`=7997;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(7997, 1, -4532.19, 807.833, 59.9749, 'Captured Sprite Darter'),
+(7997, 2, -4526.04, 799.328, 59.4271, 'Captured Sprite Darter'),
+(7997, 3, -4518.87, 786.24, 59.9261, 'Captured Sprite Darter'),
+(7997, 4, -4516.6, 766.617, 60.6654, 'Captured Sprite Darter'),
+(7997, 5, -4516.79, 749.124, 60.4805, 'Captured Sprite Darter'),
+(7997, 6, -4517.52, 731.643, 60.9822, 'Captured Sprite Darter'),
+(7997, 7, -4522.3, 710.707, 60.8061, 'Captured Sprite Darter'),
+(7997, 8, -4530.08, 695.036, 60.6917, 'Captured Sprite Darter'),
+(7997, 9, -4537.26, 679.979, 60.5726, 'Captured Sprite Darter'),
+(7997, 10, -4541.54, 655.429, 58.551, 'Captured Sprite Darter'),
+(7997, 11, -4539.33, 649.443, 57.9488, 'Captured Sprite Darter'),
+(7997, 12, -4526.54, 639.678, 56.2069, 'Captured Sprite Darter'),
+(7997, 13, -4507.92, 627.417, 55.6034, 'Captured Sprite Darter');
+
+UPDATE `creature_template_addon` SET `auras`= "" WHERE entry=7726;
+SET @ENTRY := 7726;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Aggro - Set Event Phase 1 (No Repeat)"),
+(@ENTRY,0,1,0,4,1,100,1,0,0,0,0,11,9739,0,0,0,0,0,2,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Aggro - Cast 'Wrath' (Phase 1) (No Repeat)"),
+(@ENTRY,0,2,0,9,1,100,0,0,40,3400,4700,11,9739,0,0,0,0,0,2,0,0,0,0,0,0,0,"Grimtotem Naturalist - Within 0-40 Range - Cast 'Wrath' (Phase 1)"),
+(@ENTRY,0,3,0,3,1,100,0,0,15,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - Between 0-15% Mana - Set Event Phase 2 (Phase 1)"),
+(@ENTRY,0,4,0,3,2,100,0,30,100,100,100,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - Between 30-100% Mana - Set Event Phase 1 (Phase 2)"),
+(@ENTRY,0,5,0,7,1,100,1,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Evade - Set Event Phase 0 (Phase 1) (No Repeat)"),
+(@ENTRY,0,6,7,2,0,100,1,0,50,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - Between 0-50% Health - Set Event Phase 3 (Phase 1) (No Repeat)"),
+(@ENTRY,0,7,0,61,0,100,1,0,50,0,0,11,19030,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - Between 0-50% Health - Cast 'Bear Form' (Phase 1) (No Repeat)"),
+(@ENTRY,0,8,0,0,4,100,0,3000,4500,12000,13000,11,12161,0,0,0,0,0,2,0,0,0,0,0,0,0,"Grimtotem Naturalist - In Combat - Cast 'Maul' (Phase 4)"),
+(@ENTRY,0,9,0,0,4,100,0,8000,9000,25000,26000,11,15727,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - In Combat - Cast 'Demoralizing Roar' (Phase 4)"),
+(@ENTRY,0,10,0,7,4,100,1,0,0,0,0,28,19030,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Evade - Remove Aura (Phase 4) (No Repeat)"),
+(@ENTRY,0,11,0,7,4,100,1,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Evade - Set Event Phase 0 (Phase 4) (No Repeat)");
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22331 AND `source_type`=0 AND `id`=20;
+*/
diff --git a/sql/updates/world/2015_09_11_43_world_from_335.sql b/sql/updates/world/2015_09_11_43_world_from_335.sql
new file mode 100644
index 0000000000..79f9ae687c
--- /dev/null
+++ b/sql/updates/world/2015_09_11_43_world_from_335.sql
@@ -0,0 +1,73 @@
+SET @CGUID   := 136178; 
+
+DELETE FROM `creature` WHERE `id`=23311;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 23311, 530, 1, 1,  -5076.106, 25.09657, 80.35052, 6.236346, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+1, 23311, 530, 1, 1,  -5233.175, 64.53071, 64.41123, 0.7679449, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40732 - 40732) (possible waypoints or random movement)
+(@CGUID+2, 23311, 530, 1, 1,  -5185.78, 143.9119, 71.66191, 1.692969, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+3, 23311, 530, 1, 1,  -5275.489, 149.1322, 58.53136, 2.443461, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+4, 23311, 530, 1, 1,  -5091.079, -114.7144, 64.35689, 1.239184, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+5, 23311, 530, 1, 1,  -4979.629, -99.6888, 42.13466, 4.049164, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+6, 23311, 530, 1, 1,  -5214.68, 221.5429, 72.53944, 4.380776, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40732 - 40732) (possible waypoints or random movement)
+(@CGUID+7, 23311, 530, 1, 1,  -5227.612, 271.558, 70.12395, 0.3334433, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+8, 23311, 530, 1, 1,  -5286.284, 241.2294, 67.83147, 4.598778, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+9, 23311, 530, 1, 1,  -5269.888, 303.3626, 73.55891, 0.05235988, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+10, 23311, 530, 1, 1,  -5285.691, 388.9862, 54.89359, 5.131268, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+11, 23311, 530, 1, 1,  -5329.144, 192.1793, 52.40875, 0.5977584, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40714 - 40714)
+(@CGUID+12, 23311, 530, 1, 1,  -5313.125, 170.9132, 54.45731, 2.199115, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+13, 23311, 530, 1, 1,  -4988.237, 135.2316, 79.1295, 4.974188, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+14, 23311, 530, 1, 1,  -4926.947, 217.0098, 65.26778, 3.333579, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+15, 23311, 530, 1, 1,  -4922.614, 151.7855, 56.78815, 1.780236, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+16, 23311, 530, 1, 1,  -4993.667, 235.146, 80.8679, 5.72468, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40732 - 40732) (possible waypoints or random movement)
+(@CGUID+17, 23311, 530, 1, 1,  -4991.519, 300.2075, 82.21542, 4.956735, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40732 - 40732) (possible waypoints or random movement)
+(@CGUID+18, 23311, 530, 1, 1,  -4849.121, 450.1942, 60.71572, 1.780236, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+19, 23311, 530, 1, 1,  -4982.719, -33.12109, 69.65373, 2.86234, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+20, 23311, 530, 1, 1,  -5073.178, 478.2025, 84.05375, 0.4363323, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+21, 23311, 530, 1, 1,  -5037.911, 538.4877, 88.20789, 5.393067, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+22, 23311, 530, 1, 1,  -4993.51, 508.6491, 85.82965, 5.986479, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+23, 23311, 530, 1, 1,  -4962.048, 525.7373, 79.19551, 3.764333, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+24, 23311, 530, 1, 1,  -5005.264, 532.8912, 87.46109, 4.386611, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+25, 23311, 530, 1, 1,  -4892.17, 276.9066, 64.75311, 0.4014257, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+26, 23311, 530, 1, 1,  -5141.98, 473.9572, 78.60102, 0.4886922, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+27, 23311, 530, 1, 1,  -5200.688, 589.4948, 60.42498, 2.792527, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+28, 23311, 530, 1, 1,  -5281.205, 653.8297, 41.3046, 4.782202, 120, 0, 0), -- 23311 (Area: 3759) (Auras: 40735 - 40735)
+(@CGUID+29, 23311, 530, 1, 1,  -5221.946, 685.913, 60.32657, 4.27563, 120, 10, 1), -- 23311 (Area: 3759) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+30, 23311, 530, 1, 1,  -5148.24, 737.8401, 73.05395, 4.782202, 120, 0, 0), -- 23311 (Area: 3965) (Auras: 40732 - 40732)
+(@CGUID+31, 23311, 530, 1, 1,  -5013.051, 702.1115, 82.42272, 3.435459, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+32, 23311, 530, 1, 1,  -4969.671, 576.4045, 77.05217, 0.5155401, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+33, 23311, 530, 1, 1,  -4876.813, 515.5291, 60.59084, 5.581461, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+34, 23311, 530, 1, 1,  -4943.457, 693.7371, 71.826, 1.425557, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+-- Below are what existed in TC previously
+(@CGUID+35, 23311, 530, 1, 1,  -5241.89, 110.241, 58.1161, 5.43882, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+36, 23311, 530, 1, 1,  -5231.88, 73.5107, 64.2172, 2.70563, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+37, 23311, 530, 1, 1,  -5223.67, 41.7543, 68.7341, 5.06183, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+38, 23311, 530, 1, 1,  -5315.02, 241.323, 59.5668, 4.75553, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+39, 23311, 530, 1, 1,  -5135.13, 472.366, 78.4078, 3.1219, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+40, 23311, 530, 1, 1,  -5172.18, 449.631, 76.6452, 4.06438, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+41, 23311, 530, 1, 1,  -5200.65, 414.947, 74.4594, 4.13114, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+42, 23311, 530, 1, 1,  -5248.11, 369.244, 68.7189, 3.43999, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+43, 23311, 530, 1, 1,  -5289.96, 304.915, 67.6901, 3.63634, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+44, 23311, 530, 1, 1,  -5043.44, 498.824, 86.5357, 3.86411, 120, 10, 1); -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=23311;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN(2331100,2331101,2331102);
+
+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 
+(23311, 0, 0, 1, 8, 0, 100, 1, 40742, 0, 0, 0, 33, 23311, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - On Spell Hit (Booterang) - Give Kill Credit'),
+(23311, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 28, 40714, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Remove Aura Dazed and Confused'),
+(23311, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 28, 40732, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Remove Aura Lazy and Good for Nothing'),
+(23311, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 28, 40735, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Remove Aura Defiant and Enraged'),
+(23311, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Say'),
+(23311, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Set Run'),
+(23311, 0, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 19, 23308, 200, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Move to closest Dragonmaw Peon Work Node'),
+(23311, 0, 7, 8, 61, 0, 100, 0, 0, 0, 0, 0, 11, 39160, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Cast Booterang'),
+(23311, 0, 8, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 30000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Despawn After 30 seconds'),
+(23311, 0, 9, 10, 38, 0, 100, 0, 1, 1, 0, 0, 45, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - On Data Set - Set Data'),
+(23311, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 5, 233, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Play emote'),
+(23311, 0, 11, 0, 11, 0, 100, 0, 0, 0, 0, 0, 87, 2331100, 2331101, 2331102, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - On Spawn - Run Random Script'),
+(2331100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 75, 40714, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 1 - Add Aura Dazed and Confused'),
+(2331101, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 75, 40732, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 2 - Add Aura Lazy and Good for Nothing'),
+(2331102, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 75, 40735, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 3 - Add Aura Defiant and Enraged');
+
+
+
diff --git a/sql/updates/world/2015_09_11_44_world_from_335.sql b/sql/updates/world/2015_09_11_44_world_from_335.sql
new file mode 100644
index 0000000000..46c7c4a66b
--- /dev/null
+++ b/sql/updates/world/2015_09_11_44_world_from_335.sql
@@ -0,0 +1,10 @@
+--
+UPDATE `smart_scripts` SET `action_param2`=2 WHERE `entryorguid` IN (2991401) AND `source_type`=9 AND `id`=0;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (30208);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (30208) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2991401, 2991400) AND `source_type`=9 AND id>1;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(2991400,9,2,0,0,0,100,0,0,0,0,0,11,56230,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dead Iron Giant - On Script - Cast 'Create Fireforged Eyes'"),
+(2991401,9,2,0,0,0,100,0,0,0,0,0,11,56243,2,0,0,0,0,1,0,0,0,0,0,0,0,"Dead Iron Giant - On Script - Cast 'Summon Iron Dwarf'"),
+(2991401,9,3,0,0,0,100,0,0,0,0,0,11,56243,2,0,0,0,0,1,0,0,0,0,0,0,0,"Dead Iron Giant - On Script - Cast 'Summon Iron Dwarf'"),
+(30208,0,0,0,54,0,100,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,"Stormforged Ambusher - Just summoned - Start attack");
diff --git a/sql/updates/world/2015_09_11_45_world_from_335.sql b/sql/updates/world/2015_09_11_45_world_from_335.sql
new file mode 100644
index 0000000000..ae43bc753e
--- /dev/null
+++ b/sql/updates/world/2015_09_11_45_world_from_335.sql
@@ -0,0 +1,7 @@
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE  `id`=23311;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN(2331100,2331101,2331102) AND `id`>0;
+
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(2331100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 1 - Set Faction'),
+(2331100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 89, 10, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 1 - Set Random Movement'),
+(2331101, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 2 - Set Faction');
diff --git a/sql/updates/world/2015_09_11_46_world_from_335.sql b/sql/updates/world/2015_09_11_46_world_from_335.sql
new file mode 100644
index 0000000000..3edb064e69
--- /dev/null
+++ b/sql/updates/world/2015_09_11_46_world_from_335.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=22143 AND `source_type`=0 AND `id`=4;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=22144 AND `source_type`=0 AND `id`=4;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=22148 AND `source_type`=0 AND `id`=2;
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=23022 AND `source_type`=0 AND `id`=12;
diff --git a/sql/updates/world/2015_09_11_47_world_from_335.sql b/sql/updates/world/2015_09_11_47_world_from_335.sql
new file mode 100644
index 0000000000..495d42c313
--- /dev/null
+++ b/sql/updates/world/2015_09_11_47_world_from_335.sql
@@ -0,0 +1,163 @@
+--
+-- DK Faction Endquest - Implement Reaction for Orgrimmar and Alliance Guards
+
+DELETE FROM `creature_text` WHERE `entry` IN (68,1756,1976,3296) AND `groupid`>1;
+DELETE FROM `creature_text` WHERE `entry` IN (14304);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `comment`) VALUES 
+(68, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Stormwind City Guard'),
+(68, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Stormwind City Guard'),
+(68, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Stormwind City Guard'),
+(68, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Stormwind City Guard'),
+(68, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Stormwind City Guard'),
+(68, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Stormwind City Guard'),
+(68, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Stormwind City Guard'),
+(68, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Stormwind City Guard'),
+(68, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Stormwind City Guard'),
+(68, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Stormwind City Guard'),
+(68, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Stormwind City Guard'), 
+(14304, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Kor''kron Elite'),
+(14304, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Kor''kron Elite'),
+(14304, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Kor''kron Elite'),
+(14304, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Kor''kron Elite'),
+(14304, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Kor''kron Elite'),
+(14304, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Kor''kron Elite'),
+(14304, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Kor''kron Elite'),
+(14304, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Kor''kron Elite'),
+(14304, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Kor''kron Elite'),
+(14304, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Kor''kron Elite'),
+(14304, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Kor''kron Elite'),
+(1756, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Stormwind Royal Guard'),
+(1756, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Stormwind Royal Guard'),
+(1756, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Stormwind Royal Guard'),
+(1756, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Stormwind Royal Guard'),
+(1756, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Stormwind Royal Guard'),
+(1756, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Stormwind Royal Guard'),
+(1756, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Stormwind Royal Guard'),
+(1756, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Stormwind Royal Guard'),
+(1756, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Stormwind Royal Guard'),
+(1756, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Stormwind Royal Guard'),
+(1756, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Stormwind Royal Guard'),
+(1976, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Stormwind City Patroller'),
+(1976, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Stormwind City Patroller'),
+(1976, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Stormwind City Patroller'),
+(1976, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Stormwind City Patroller'),
+(1976, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Stormwind City Patroller'),
+(1976, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Stormwind City Patroller'),
+(1976, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Stormwind City Patroller'),
+(1976, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Stormwind City Patroller'),
+(1976, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Stormwind City Patroller'),
+(1976, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Stormwind City Patroller'),
+(1976, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Stormwind City Patroller'),
+(3296, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Orgrimmar Grunt'),
+(3296, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Orgrimmar Grunt'),
+(3296, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Orgrimmar Grunt'),
+(3296, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Orgrimmar Grunt'),
+(3296, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Orgrimmar Grunt'),
+(3296, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Orgrimmar Grunt'),
+(3296, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Orgrimmar Grunt'),
+(3296, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Orgrimmar Grunt'),
+(3296, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Orgrimmar Grunt'),
+(3296, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Orgrimmar Grunt'),
+(3296, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Orgrimmar Grunt'),
+(14304, 0, 0, 'Taste blade, mongrel!', 12, 0, 100, 0, 0, 0, 10950, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 1, 'Please tell me that you didn''t just do what I think you just did. Please tell me that I''m not going to have to hurt you... ', 12, 0, 100, 0, 0, 0, 10951, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 2, 'As if we don''t have enough problems, you go and create more!', 12, 0, 100, 0, 0, 0, 10953, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 3, 'You dare spill blood on neutral ground? OUT! OUT, I SAY!', 12, 0, 100, 0, 0, 0, 10948, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 4, 'We don''t take kindly to miscreants, $r.', 12, 0, 100, 0, 0, 0, 10949, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 5, 'Get a rope!',12, 0, 100, 0, 0, 0, 10952, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 6, 'Believe me when I tell you this: You''re gonna wish you weren''t born, sissy!', 12, 0, 100, 0, 0, 0, 10954, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 7, 'Your actions shame us all, $c. I hurt inside as I beat you senseless.', 12, 0, 100, 0, 0, 0, 10955, 'Kor''kron Elite - On Aggro');
+
+-- AIs
+-- Stormwind City Guard SAI
+SET @ENTRY := 68;
+UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,10,0,100,0,1,10,10000,10000,87,@ENTRY*100+00,@ENTRY*100+01,@ENTRY*100+02,@ENTRY*100+03,0,0,1,0,0,0,0,0,0,0,"Stormwind City Guard - Within 1-10 Range Out of Combat LoS - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On aggro - Say text1");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=68;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,68,0,0,28,0,13188,0,0,0,"","Only Run script if quest is completed");
+
+-- Kor''kron Elite SAI
+SET @ENTRY := 14304;
+UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,10,0,100,0,1,10,10000,10000,87,68*100+00,68*100+01,68*100+02,68*100+03,0,0,1,0,0,0,0,0,0,0,"Kor''kron Elite - Within 1-10 Range Out of Combat LoS - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kor''kron Elite - On aggro - Say text1");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=14304;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,14304,0,0,28,0,13189,0,0,0,"","Only Run script if quest is completed");
+
+-- Stormwind City Patroller SAI
+SET @ENTRY := 1976;
+UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,10,0,100,0,1,10,10000,10000,87,68*100+00,68*100+01,68*100+02,68*100+03,0,0,1,0,0,0,0,0,0,0,"Stormwind City Patroller - Within 1-10 Range Out of Combat LoS - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Patroller - On aggro - Say text1");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=1976;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,1976,0,0,28,0,13188,0,0,0,"","Only Run script if quest is completed");
+
+-- Stormwind Royal Guard SAI
+SET @ENTRY := 1756;
+UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,10,0,100,0,1,10,10000,10000,87,68*100+00,68*100+01,68*100+02,68*100+03,0,0,1,0,0,0,0,0,0,0,"Stormwind Royal Guard - Within 1-10 Range Out of Combat LoS - Run Random Script");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=1756;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,1756,0,0,28,0,13188,0,0,0,"","Only Run script if quest is completed");
+
+-- Orgrimmar Grunt SAI
+SET @ENTRY := 3296;
+UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,10,0,100,0,1,10,10000,10000,87,68*100+00,68*100+01,68*100+02,68*100+03,0,0,1,0,0,0,0,0,0,0,"Orgrimmar Grunt - Within 1-10 Range Out of Combat LoS - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Orgrimmar Grunt - On aggro - Say text1");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=3296;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,3296,0,0,28,0,13189,0,0,0,"","Only Run script if quest is completed");
+
+-- Actionlist SAI
+SET @ENTRY := 6800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,11,58509,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Cast ''Rotten Apple Toss'"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Say Line 2");
+
+-- Actionlist SAI
+SET @ENTRY := 6801;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,11,58513,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Cast 'Rotten Banana Toss'"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Say Line 3");
+
+-- Actionlist SAI
+SET @ENTRY := 6802;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,11,58520,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Cast 'Spit'"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,1,4,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Say Line 4");
+
+-- Actionlist SAI
+SET @ENTRY := 6803;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Say Line 5");
+
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (58509, 58513, 58520);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES 
+(58509, 58511, 0, 'Rotten Apple - Rotten Apple'),
+(58513, 58514, 0, 'Rotten Banana - Rotten Banana'),
+(58520, 58519, 0, 'Spit - Spit');
diff --git a/sql/updates/world/2015_09_11_48_world_from_335.sql b/sql/updates/world/2015_09_11_48_world_from_335.sql
new file mode 100644
index 0000000000..bfae5b6eaf
--- /dev/null
+++ b/sql/updates/world/2015_09_11_48_world_from_335.sql
@@ -0,0 +1,8 @@
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN(2331100,2331101,2331102) AND `id`>0;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` =23311 AND `id`=12;
+UPDATE `smart_scripts` SET `link`=12 WHERE  `entryorguid`=23311 AND `source_type`=0 AND `id`=8 AND `link`=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 
+(2331100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 89, 10, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 1 - Set Random Movement'),
+(2331102, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 14, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 3 - Set Faction'),
+(23311, 0, 12, 0, 61, 0, 100, 0, 0, 0, 0, 0, 2, 62, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Set Faction');
diff --git a/sql/updates/world/2015_09_11_49_world_from_335.sql b/sql/updates/world/2015_09_11_49_world_from_335.sql
new file mode 100644
index 0000000000..6ddd137c60
--- /dev/null
+++ b/sql/updates/world/2015_09_11_49_world_from_335.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 57387;
+INSERT INTO `spell_linked_spell` VALUES (57387, 57608, 0, 'Argent Cannon - Powering Up The Core');
+UPDATE `creature` SET `curhealth`=126000 WHERE `id`=30236;
+UPDATE `creature_template` SET `unit_flags2`=0, `RegenHealth`=0 WHERE `entry`=30236;
diff --git a/sql/updates/world/2015_09_11_50_world_from_335.sql b/sql/updates/world/2015_09_11_50_world_from_335.sql
new file mode 100644
index 0000000000..1b000429a1
--- /dev/null
+++ b/sql/updates/world/2015_09_11_50_world_from_335.sql
@@ -0,0 +1,15 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (58203);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17,0,58203,0,0,31,1,3,31075,0,0,0,'','Iron Chain');
+
+UPDATE `smart_scripts` SET `event_param1`=500, `event_param2`=500, `action_type`=51 WHERE `entryorguid` IN (3092000) AND `source_type`=9 AND `id`=5;
+UPDATE `smart_scripts` SET `event_param1`=2000, `event_param2`=2000, `action_param1`=52520 WHERE `entryorguid` IN (3092000) AND `source_type`=9 AND `id`=0;
+UPDATE `smart_scripts` SET `event_param1`=2000, `event_param2`=2000, `action_param1`=58231, `target_type`=1, `target_param1`=0 WHERE `entryorguid` IN (3107500) AND `source_type`=9 AND `id`=0;
+UPDATE `smart_scripts` SET `event_type`=38, `event_param1`=1, `event_param2`=1, `event_param3`=0, `event_param4`=0, `action_type`=103, `action_param1`=1, `comment`="Scourge Bomb - On Data Set 1 1 - Root" WHERE `entryorguid` IN (31075) AND `source_type`=0 AND `id`=3;
+UPDATE `smart_scripts` SET `event_param1`=1000, `event_param2`=1000, `action_param1`=0 WHERE `entryorguid` IN (3107500) AND `source_type`=9 AND `id`=1;
+UPDATE `smart_scripts` SET `event_param3`=3 WHERE `entryorguid` IN (30920) AND `source_type`=0 AND `id`=1;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (58231);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,2,58231,0,0,31,0,3,31075,0,1,0,'','Exploding Abomination');
diff --git a/sql/updates/world/2015_09_11_51_world_from_335.sql b/sql/updates/world/2015_09_11_51_world_from_335.sql
new file mode 100644
index 0000000000..ac4c458096
--- /dev/null
+++ b/sql/updates/world/2015_09_11_51_world_from_335.sql
@@ -0,0 +1,39 @@
+--
+-- Weapon Master Hanashi: add the missing linked IDs in `action_menu_id`
+UPDATE `gossip_menu_option` SET `action_menu_id`= 5262 WHERE `menu_id`= 5263 AND `OptionBroadcastTextID`= 8812;
+
+-- Hanashi is a troll, using Low Common "Troll" speech, so link the correct text lines for him:
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8603 WHERE `menu_id`= 5262 AND `option_text`= 'Crossbow';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8604 WHERE `menu_id`= 5262 AND `option_text`= 'Dagger';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8605 WHERE `menu_id`= 5262 AND `option_text`= 'Fist Weapon';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8606 WHERE `menu_id`= 5262 AND `option_text`= 'Gun';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8607 WHERE `menu_id`= 5262 AND `option_text`= 'Mace';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8608 WHERE `menu_id`= 5262 AND `option_text`= 'Polearm';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8609 WHERE `menu_id`= 5262 AND `option_text`= 'Sword';
+
+-- Weapon Master Archibald: add missing linked IDs to `action_menu_id` (using default gossip from npc_text)
+UPDATE `gossip_menu_option` SET `action_menu_id`= 5268 WHERE `menu_id`= 5269 AND `OptionBroadcastTextID`= 8812;
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8592 WHERE `menu_id`= 5268 AND `option_text`= 'Axe';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8593 WHERE `menu_id`= 5268 AND `option_text`= 'Bow';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8596 WHERE `menu_id`= 5268 AND `option_text`= 'Fist Weapon';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8597 WHERE `menu_id`= 5268 AND `option_text`= 'Gun';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8598 WHERE `menu_id`= 5268 AND `option_text`= 'Mace';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8600 WHERE `menu_id`= 5268 AND `option_text`= 'Staff';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8602 WHERE `menu_id`= 5268 AND `option_text`= 'Thrown';
+
+-- Weapon Master Sayoc: add the gossip link ID 5220 in `action_menu_id` and link it in `gossip_menu` too
+UPDATE `gossip_menu_option` SET `action_menu_id` = 5222 WHERE `menu_id` = 5221 AND `OptionBroadcastTextID`= 8812;
+-- Sayoc needs new lines in `gossip_menu_option` as well as the linked lines from npc_text :
+DELETE FROM `gossip_menu_option` WHERE `menu_id` = 5222 AND `OptionBroadcastTextID` IN (20582,20585,20586,20587,20588,20589);
+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
+(5222,0,0,'Crossbow',20582,1,1,8594,0,0,0,'',0),
+(5222,1,0,'Gun',20585,1,1,8597,0,0,0,'',0),
+(5222,2,0,'Mace',20586,1,1,8598,0,0,0,'',0),
+(5222,3,0,'Polearm',20587,1,1,8599,0,0,0,'',0),
+(5222,4,0,'Staff',20588,1,1,8610,0,0,0,'',0), -- 
+(5222,5,0,'Sword',20589,1,1,8601,0,0,0,'',0);
+
+UPDATE `creature_template` SET `type_flags`=134217728  WHERE `entry` IN (17005);
+DELETE FROM `gossip_menu_option` WHERE (`menu_id`=7337);
+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
+(7337,0,3,'Show me what you know, Larenis.',13168,5,16,0,0,0,0,'',0);
diff --git a/sql/updates/world/2015_09_11_52_world_from_335.sql b/sql/updates/world/2015_09_11_52_world_from_335.sql
new file mode 100644
index 0000000000..5fbf0df348
--- /dev/null
+++ b/sql/updates/world/2015_09_11_52_world_from_335.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `type_flags`=`type_flags`|134217728  WHERE `npcflag`>16 AND `gossip_menu_id`!= 0;
diff --git a/sql/updates/world/2015_09_11_53_world_from_335.sql b/sql/updates/world/2015_09_11_53_world_from_335.sql
new file mode 100644
index 0000000000..697123fefa
--- /dev/null
+++ b/sql/updates/world/2015_09_11_53_world_from_335.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `creature` WHERE `guid` IN (120831,120833,123124);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES
+(120831, 32769, 571, 1, 1, 25753, 0, 7523.09, 1852.78, 491.641, 3.23212, 300, 0, 0, 12600, 3994, 0, 0, 0, 0, 0),
+(120833, 32769, 571, 1, 1, 25753, 0, 7703.2, 1822.89, 469.378, 3.94286, 300, 0, 0, 12600, 3994, 0, 0, 0, 0, 0),
+(123124, 32769, 571, 1, 1, 25753, 0, 7733.55, 1578.02, 469.378, 2.51066, 300, 0, 0, 12600, 3994, 0, 0, 0, 0, 0);
+
+DELETE FROM pool_creature WHERE guid = 151994;