diff --git a/sql/world/base/naxx40_creatures.sql b/sql/world/base/naxx40_creatures.sql
index bbe9809..b6d9c12 100644
--- a/sql/world/base/naxx40_creatures.sql
+++ b/sql/world/base/naxx40_creatures.sql
@@ -2895,13 +2895,27 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`,
 (@GUID+1059, @CENTRY+90, 0, 0, 533, 0, 0, 4, 1, 0, 2846.52, -3789.07, 274.983, 2.23402, 3600, 0, 0, 13033, 0, 0, 0, 0, 0, '', 0, 0, NULL);
 
 
-DELETE FROM `waypoint_data` WHERE `id` IN (@WPID+1020,@WPID+1030,@WPID+1080,@WPID+1090,@WPID+1100,@WPID+1110,@WPID+1120,@WPID+1520,@WPID+1530,@WPID+1600,@WPID+1630,@WPID+1780,@WPID+1830,@WPID+2200,@WPID+2300,
+DELETE FROM `waypoint_data` WHERE `id` IN (@WPID+600,@WPID+630,@WPID+1020,@WPID+1030,@WPID+1080,@WPID+1090,@WPID+1100,@WPID+1110,@WPID+1120,@WPID+1520,@WPID+1530,@WPID+1780,@WPID+1830,@WPID+2200,@WPID+2300,
 @WPID+2330,@WPID+2340,@WPID+2410,@WPID+2450,@WPID+2480,@WPID+2530,@WPID+2570,@WPID+2590,@WPID+2620,@WPID+2630,@WPID+2670,@WPID+2810,@WPID+2900,@WPID+3040,@WPID+3200,@WPID+3210,@WPID+3220,@WPID+3230,@WPID+3240,
 @WPID+3250,@WPID+3390,@WPID+3420,@WPID+3450,@WPID+3740,@WPID+3870,@WPID+3940,@WPID+3980,@WPID+4060,@WPID+4120,@WPID+4150,@WPID+4200,@WPID+4240,@WPID+4280,@WPID+4340,@WPID+4380,@WPID+4460,@WPID+4510,@WPID+4550,
 @WPID+4600,@WPID+4640,@WPID+4680,@WPID+4730,@WPID+4780,@WPID+4820,@WPID+4870,@WPID+4910,@WPID+4950,@WPID+5000,@WPID+5050,@WPID+5090,@WPID+5130,@WPID+5180,@WPID+5220,@WPID+5810,@WPID+5830,@WPID+5840,@WPID+5870,
 @WPID+5880,@WPID+7580,@WPID+7590,@WPID+7730,@WPID+7910,@WPID+8450,@WPID+8470,@WPID+8490,@WPID+8580,@WPID+8750,@WPID+8760,@WPID+8960,@WPID+9060,@WPID+9070,@WPID+9490,@WPID+9500,@WPID+9810);
 
 INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`) VALUES
+(@WPID+600, 1, 2847.82, -3308.78, 298.147, NULL, 0),
+(@WPID+600, 2, 2838.80, -3321.94, 298.152, NULL, 0),
+(@WPID+600, 3, 2847.82, -3308.78, 298.147, NULL, 0),
+(@WPID+600, 4, 2845.06, -3296.36, 298.124, NULL, 0),
+(@WPID+600, 5, 2832.53, -3295.22, 298.150, NULL, 0),
+(@WPID+600, 6, 2845.06, -3296.36, 298.124, NULL, 0),
+(@WPID+630, 1, 2830.41, -3329.09, 304.837, NULL, 0),
+(@WPID+630, 2, 2835.76, -3331.32, 299.364, NULL, 0),
+(@WPID+630, 3, 2842.91, -3323.56, 298.155, NULL, 0),
+(@WPID+630, 4, 2852.52, -3333.61, 298.146, NULL, 0),
+(@WPID+630, 5, 2854.87, -3350.62, 298.146, NULL, 0),
+(@WPID+630, 6, 2852.52, -3333.61, 298.146, NULL, 0),
+(@WPID+630, 7, 2842.91, -3323.56, 298.155, NULL, 0),
+(@WPID+630, 8, 2835.76, -3331.32, 299.364, NULL, 0),
 (@WPID+1020, 1, 2872.72, -3489.73, 297.62, 0.0, 0),
 (@WPID+1020, 2, 2855.09, -3489.83, 297.883, 0.0, 0),
 (@WPID+1020, 3, 2836.62, -3489.82, 297.864, 0.0, 0),
@@ -3008,20 +3022,6 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio
 (@WPID+1530, 6, 3169.74, -3300.18, 294.607, 2.30692, 0),
 (@WPID+1530, 7, 3136.21, -3342.25, 293.629, 2.40117, 0),
 (@WPID+1530, 8, 3122.67, -3328.53, 293.629, 2.28807, 0),
-(@WPID+1600, 1, 2847.82, -3308.78, 298.147, NULL, 0),
-(@WPID+1600, 2, 2838.80, -3321.94, 298.152, NULL, 0),
-(@WPID+1600, 3, 2847.82, -3308.78, 298.147, NULL, 0),
-(@WPID+1600, 4, 2845.06, -3296.36, 298.124, NULL, 0),
-(@WPID+1600, 5, 2832.53, -3295.22, 298.150, NULL, 0),
-(@WPID+1600, 6, 2845.06, -3296.36, 298.124, NULL, 0),
-(@WPID+1630, 1, 2830.41, -3329.09, 304.837, NULL, 0),
-(@WPID+1630, 2, 2835.76, -3331.32, 299.364, NULL, 0),
-(@WPID+1630, 3, 2842.91, -3323.56, 298.155, NULL, 0),
-(@WPID+1630, 4, 2852.52, -3333.61, 298.146, NULL, 0),
-(@WPID+1630, 5, 2854.87, -3350.62, 298.146, NULL, 0),
-(@WPID+1630, 6, 2852.52, -3333.61, 298.146, NULL, 0),
-(@WPID+1630, 7, 2842.91, -3323.56, 298.155, NULL, 0),
-(@WPID+1630, 8, 2835.76, -3331.32, 299.364, NULL, 0),
 (@WPID+1780, 1, 3305.03, -3231.81, 294.063, 3.14091, 0),
 (@WPID+1780, 2, 3257.44, -3230.36, 294.063, 2.78355, 0),
 (@WPID+1780, 3, 3232.6, -3210.97, 294.063, 2.35551, 0),