diff --git a/data/sql/updates/pending_db_world/rev_1647877892045091200.sql b/data/sql/updates/pending_db_world/rev_1647877892045091200.sql
new file mode 100644
index 000000000..63cd49d30
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1647877892045091200.sql
@@ -0,0 +1,581 @@
+/* Set correct movement flags for Buzzard creatures */
+UPDATE `creature_template_movement` SET `Ground` = 2 WHERE `CreatureId` IN (2830, 2829);
+
+/*  Buzzard - GUID 7006  */
+
+
+SET @NPC := 7006;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6811.91, `position_y` = -3616.86, `position_z` = 247.556, `orientation` = 2.74597 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6809.25, -3596.17, 243.167, 100.0, 0, 2),
+(@PATH, 2, -6797.86, -3589.94, 241.792, 100.0, 0, 2),
+(@PATH, 3, -6758.9, -3579.09, 243.121, 100.0, 0, 2),
+(@PATH, 4, -6745.04, -3555.24, 245.206, 100.0, 5000, 2),
+(@PATH, 5, -6770.95, -3532.25, 245.837, 100.0, 0, 2),
+(@PATH, 6, -6797.96, -3506.01, 242.788, 100.0, 0, 2),
+(@PATH, 7, -6799.65, -3463.84, 241.792, 100.0, 0, 2),
+(@PATH, 8, -6760.58, -3444.72, 241.988, 100.0, 0, 2),
+(@PATH, 9, -6735.39, -3412.09, 241.792, 100.0, 0, 2),
+(@PATH, 10, -6720.83, -3385.17, 241.785, 100.0, 0, 2),
+(@PATH, 11, -6697.01, -3374.81, 243.211, 100.0, 0, 2),
+(@PATH, 12, -6720.83, -3385.17, 241.785, 100.0, 0, 2),
+(@PATH, 13, -6735.39, -3412.09, 241.792, 100.0, 0, 2),
+(@PATH, 14, -6760.58, -3444.72, 241.988, 100.0, 0, 2),
+(@PATH, 15, -6799.65, -3463.84, 241.792, 100.0, 0, 2),
+(@PATH, 16, -6797.96, -3506.01, 242.788, 100.0, 0, 2),
+(@PATH, 17, -6770.95, -3532.25, 245.837, 100.0, 0, 2),
+(@PATH, 18, -6745.04, -3555.24, 245.206, 100.0, 0, 2),
+(@PATH, 19, -6758.9, -3579.09, 243.121, 100.0, 0, 2),
+(@PATH, 20, -6797.86, -3589.94, 241.792, 100.0, 0, 2),
+(@PATH, 21, -6809.25, -3596.17, 243.167, 100.0, 0, 2),
+(@PATH, 22, -6814.66, -3615.71, 247.226, 100.0, 0, 2);
+
+/*  Buzzard - GUID 7137  */
+
+
+SET @NPC := 7137;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -7112.69, `position_y` = -3521.0, `position_z` = 246.566, `orientation` = 5.30948 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -7077.76, -3543.48, 241.898, 100.0, 0, 2),
+(@PATH, 2, -7045.7, -3551.22, 243.829, 100.0, 0, 2),
+(@PATH, 3, -7015.01, -3551.6, 243.641, 100.0, 0, 2),
+(@PATH, 4, -6982.05, -3518.47, 242.542, 100.0, 0, 2),
+(@PATH, 5, -6968.26, -3491.34, 241.792, 100.0, 0, 2),
+(@PATH, 6, -6940.34, -3458.93, 241.792, 100.0, 0, 2),
+(@PATH, 7, -6921.61, -3465.03, 242.421, 100.0, 0, 2),
+(@PATH, 8, -6878.95, -3466.98, 244.479, 100.0, 0, 2),
+(@PATH, 9, -6851.05, -3453.28, 244.063, 100.0, 0, 2),
+(@PATH, 10, -6826.14, -3458.7, 244.067, 100.0, 0, 2),
+(@PATH, 11, -6784.65, -3464.25, 241.792, 100.0, 0, 2),
+(@PATH, 12, -6754.12, -3479.79, 242.417, 100.0, 0, 2),
+(@PATH, 13, -6715.67, -3483.13, 241.924, 100.0, 0, 2),
+(@PATH, 14, -6686.95, -3487.32, 252.35699999999997, 100.0, 0, 2),
+(@PATH, 15, -6715.67, -3483.13, 241.799, 100.0, 0, 2),
+(@PATH, 16, -6754.12, -3479.79, 242.417, 100.0, 0, 2),
+(@PATH, 17, -6784.65, -3464.25, 241.792, 100.0, 0, 2),
+(@PATH, 18, -6826.14, -3458.7, 244.067, 100.0, 0, 2),
+(@PATH, 19, -6851.05, -3453.28, 244.063, 100.0, 0, 2),
+(@PATH, 20, -6878.95, -3466.98, 244.479, 100.0, 0, 2),
+(@PATH, 21, -6921.61, -3465.03, 242.421, 100.0, 0, 2),
+(@PATH, 22, -6940.34, -3458.93, 241.792, 100.0, 0, 2),
+(@PATH, 23, -6968.26, -3491.34, 241.792, 100.0, 0, 2),
+(@PATH, 24, -6982.05, -3518.47, 242.542, 100.0, 0, 2),
+(@PATH, 25, -7015.01, -3551.6, 243.641, 100.0, 0, 2),
+(@PATH, 26, -7045.7, -3551.22, 243.829, 100.0, 0, 2),
+(@PATH, 27, -7077.76, -3543.48, 241.898, 100.0, 0, 2),
+(@PATH, 28, -7107.82, -3528.15, 245.41, 100.0, 0, 2);
+
+/*  Shadowforge Surveyor - GUID 7220  */
+
+
+SET @NPC := 7220;
+SET @PATH := @NPC * 10;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`) VALUES
+(@PATH, 1, -6144.04, -3081.53, 225.98, 100.0, 0),
+(@PATH, 2, -6146.38, -3077.72, 225.765, 100.0, 0),
+(@PATH, 3, -6149.53, -3071.44, 226.486, 100.0, 0),
+(@PATH, 4, -6152.11, -3068.48, 226.113, 100.0, 0),
+(@PATH, 5, -6154.74, -3063.19, 225.002, 100.0, 0),
+(@PATH, 6, -6155.24, -3055.54, 224.84, 100.0, 0),
+(@PATH, 7, -6154.36, -3048.77, 224.491, 100.0, 0),
+(@PATH, 8, -6150.64, -3042.61, 224.529, 100.0, 0),
+(@PATH, 9, -6144.75, -3037.45, 224.996, 100.0, 0),
+(@PATH, 10, -6137.22, -3033.51, 223.743, 100.0, 0),
+(@PATH, 11, -6144.75, -3037.45, 224.996, 100.0, 0),
+(@PATH, 12, -6150.64, -3042.61, 224.529, 100.0, 0),
+(@PATH, 13, -6154.36, -3048.77, 224.491, 100.0, 0),
+(@PATH, 14, -6155.24, -3055.54, 224.84, 100.0, 0),
+(@PATH, 15, -6154.85, -3062.72, 224.862, 100.0, 0),
+(@PATH, 16, -6152.16, -3068.39, 226.126, 100.0, 0),
+(@PATH, 17, -6149.53, -3071.44, 226.486, 100.0, 0),
+(@PATH, 18, -6146.38, -3077.72, 225.765, 100.0, 0),
+(@PATH, 19, -6144.04, -3081.53, 225.98, 100.0, 0),
+(@PATH, 20, -6141.79, -3087.05, 225.732, 100.0, 0);
+
+/*  Shadowforge Digger - GUID 7224  */
+
+
+SET @NPC := 7224;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature_addon` set `path_id` = @PATH WHERE `guid` = @NPC;
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`) VALUES
+(@PATH, 1, -6154.46, -3053.13, 224.826, 100.0, 0),
+(@PATH, 2, -6154.06, -3046.47, 224.652, 100.0, 0),
+(@PATH, 3, -6155.4, -3043.88, 224.422, 2.28, 45000),
+(@PATH, 4, -6155.82, -3055.49, 224.807, 100.0, 0),
+(@PATH, 5, -6153.58, -3059.57, 224.93, 100.0, 0),
+(@PATH, 6, -6151.7, -3060.31, 225.245, 0.471239, 45000);
+
+/*  Buzzard - GUID 7251  */
+
+
+SET @NPC := 7251;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6883.96, `position_y` = -3329.96, `position_z` = 248.58, `orientation` = 0.251015 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6888.0, -3356.21, 243.799, 100.0, 0, 2),
+(@PATH, 2, -6901.86, -3377.27, 242.131, 100.0, 0, 2),
+(@PATH, 3, -6933.3, -3395.66, 242.587, 100.0, 0, 2),
+(@PATH, 4, -6933.27, -3431.34, 242.621, 100.0, 0, 2),
+(@PATH, 5, -6924.07, -3460.16, 242.376, 100.0, 0, 2),
+(@PATH, 6, -6951.56, -3493.01, 241.917, 100.0, 0, 2),
+(@PATH, 7, -6944.84, -3526.17, 241.792, 100.0, 0, 2),
+(@PATH, 8, -6926.08, -3562.52, 241.907, 100.0, 0, 2),
+(@PATH, 9, -6915.77, -3598.79, 242.975, 100.0, 0, 2),
+(@PATH, 10, -6951.36, -3628.01, 241.792, 100.0, 0, 2),
+(@PATH, 11, -6934.38, -3651.09, 246.249, 100.0, 0, 2),
+(@PATH, 12, -6951.36, -3628.01, 241.792, 100.0, 0, 2),
+(@PATH, 13, -6915.77, -3598.79, 242.975, 100.0, 0, 2),
+(@PATH, 14, -6926.08, -3562.52, 241.907, 100.0, 0, 2),
+(@PATH, 15, -6944.84, -3526.17, 241.792, 100.0, 0, 2),
+(@PATH, 16, -6951.56, -3493.01, 241.917, 100.0, 0, 2),
+(@PATH, 17, -6924.07, -3460.16, 242.376, 100.0, 0, 2),
+(@PATH, 18, -6933.27, -3431.34, 242.621, 100.0, 0, 2),
+(@PATH, 19, -6933.3, -3395.66, 242.587, 100.0, 0, 2),
+(@PATH, 20, -6901.86, -3377.27, 242.131, 100.0, 0, 2),
+(@PATH, 21, -6888.0, -3356.21, 243.799, 100.0, 0, 2),
+(@PATH, 22, -6879.02, -3328.7, 247.92, 100.0, 0, 2);
+
+/*  Buzzard - GUID 7252  */
+
+
+SET @NPC := 7252;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6947.38, `position_y` = -3311.41, `position_z` = 260.875, `orientation` = 4.50295 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6932.46, -3343.0, 243.987, 100.0, 0, 2),
+(@PATH, 2, -6936.72, -3372.14, 241.792, 100.0, 0, 2),
+(@PATH, 3, -6936.86, -3388.97, 242.167, 100.0, 0, 2),
+(@PATH, 4, -6957.8, -3415.2, 241.792, 100.0, 0, 2),
+(@PATH, 5, -6981.07, -3437.66, 241.792, 100.0, 0, 2),
+(@PATH, 6, -7012.01, -3448.14, 242.167, 100.0, 0, 2),
+(@PATH, 7, -7034.03, -3482.56, 241.762, 100.0, 0, 2),
+(@PATH, 8, -7041.37, -3520.53, 243.426, 100.0, 0, 2),
+(@PATH, 9, -7044.2, -3550.63, 244.01, 100.0, 0, 2),
+(@PATH, 10, -7085.11, -3563.21, 241.792, 100.0, 0, 2),
+(@PATH, 11, -7098.92, -3597.39, 244.899, 100.0, 0, 2),
+(@PATH, 12, -7085.11, -3563.21, 241.792, 100.0, 0, 2),
+(@PATH, 13, -7044.2, -3550.63, 244.01, 100.0, 0, 2),
+(@PATH, 14, -7041.37, -3520.53, 243.426, 100.0, 0, 2),
+(@PATH, 15, -7034.03, -3482.56, 241.762, 100.0, 0, 2),
+(@PATH, 16, -7012.01, -3448.14, 242.167, 100.0, 0, 2),
+(@PATH, 17, -6981.07, -3437.66, 241.792, 100.0, 0, 2),
+(@PATH, 18, -6957.8, -3415.2, 241.792, 100.0, 0, 2),
+(@PATH, 19, -6936.86, -3388.97, 242.167, 100.0, 0, 2),
+(@PATH, 20, -6936.72, -3372.14, 241.792, 100.0, 0, 2),
+(@PATH, 21, -6932.46, -3343.0, 243.987, 100.0, 0, 2),
+(@PATH, 22, -6946.19, -3315.67, 258.952, 100.0, 0, 2);
+
+/*  Buzzard - GUID 7253  */
+
+
+SET @NPC := 7253;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -7181.01, `position_y` = -3326.08, `position_z` = 247.645, `orientation` = 0.822118 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -7147.13, -3335.6, 244.256, 100.0, 0, 2),
+(@PATH, 2, -7120.95, -3360.97, 242.911, 100.0, 0, 2),
+(@PATH, 3, -7112.48, -3395.7, 241.918, 100.0, 0, 2),
+(@PATH, 4, -7093.57, -3428.64, 242.185, 100.0, 0, 2),
+(@PATH, 5, -7063.82, -3436.23, 245.298, 100.0, 0, 2),
+(@PATH, 6, -7031.27, -3456.35, 243.157, 100.0, 0, 2),
+(@PATH, 7, -6998.35, -3486.11, 241.792, 100.0, 0, 2),
+(@PATH, 8, -6992.29, -3516.26, 243.167, 100.0, 0, 2),
+(@PATH, 9, -6970.74, -3551.4, 241.866, 100.0, 0, 2),
+(@PATH, 10, -6947.52, -3554.22, 242.042, 100.0, 0, 2),
+(@PATH, 11, -6919.98, -3577.41, 242.47, 100.0, 0, 2),
+(@PATH, 12, -6901.67, -3608.33, 242.993, 100.0, 0, 2),
+(@PATH, 13, -6891.81, -3634.18, 246.06, 100.0, 0, 2),
+(@PATH, 14, -6901.67, -3608.33, 242.993, 100.0, 0, 2),
+(@PATH, 15, -6919.98, -3577.41, 242.47, 100.0, 0, 2),
+(@PATH, 16, -6947.52, -3554.22, 242.042, 100.0, 0, 2),
+(@PATH, 17, -6970.74, -3551.4, 241.866, 100.0, 0, 2),
+(@PATH, 18, -6992.29, -3516.26, 243.167, 100.0, 0, 2),
+(@PATH, 19, -6998.35, -3486.11, 241.792, 100.0, 0, 2),
+(@PATH, 20, -7031.27, -3456.35, 243.157, 100.0, 0, 2),
+(@PATH, 21, -7063.82, -3436.23, 245.298, 100.0, 0, 2),
+(@PATH, 22, -7093.57, -3428.64, 242.185, 100.0, 0, 2),
+(@PATH, 23, -7112.48, -3395.7, 241.918, 100.0, 0, 2),
+(@PATH, 24, -7120.95, -3360.97, 242.911, 100.0, 0, 2),
+(@PATH, 25, -7147.13, -3335.6, 244.256, 100.0, 0, 2),
+(@PATH, 26, -7177.73, -3322.53, 246.539, 100.0, 0, 2);
+
+/*  Starving Buzzard - GUID 7561  */
+
+
+SET @NPC := 7561;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6388.68, `position_y` = -3576.89, `position_z` = 269.532, `orientation` = 4.08407 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6371.3, -3594.98, 247.97, 100.0, 0, 2),
+(@PATH, 2, -6354.91, -3614.21, 242.14, 100.0, 0, 2),
+(@PATH, 3, -6362.36, -3647.93, 242.31, 100.0, 0, 2),
+(@PATH, 4, -6388.21, -3641.88, 242.295, 100.0, 0, 2),
+(@PATH, 5, -6408.34, -3626.71, 250.96, 100.0, 0, 2),
+(@PATH, 6, -6429.45, -3627.02, 257.59, 100.0, 0, 2),
+(@PATH, 7, -6445.15, -3633.09, 254.014, 100.0, 0, 2),
+(@PATH, 8, -6473.49, -3647.55, 244.618, 100.0, 0, 2),
+(@PATH, 9, -6480.76, -3664.51, 247.527, 100.0, 0, 2),
+(@PATH, 10, -6473.28, -3676.01, 252.08100000000002, 100.0, 0, 2),
+(@PATH, 11, -6471.78, -3685.61, 256.946, 100.0, 0, 2),
+(@PATH, 12, -6478.87, -3700.13, 265.363, 100.0, 0, 2),
+(@PATH, 13, -6488.8, -3703.67, 270.987, 100.0, 0, 2),
+(@PATH, 14, -6504.08, -3706.28, 273.873, 100.0, 0, 2),
+(@PATH, 15, -6526.79, -3698.45, 272.456, 100.0, 0, 2),
+(@PATH, 16, -6504.11, -3706.28, 273.991, 100.0, 0, 2),
+(@PATH, 17, -6488.8, -3703.67, 270.987, 100.0, 0, 2),
+(@PATH, 18, -6478.87, -3700.13, 265.363, 100.0, 0, 2),
+(@PATH, 19, -6471.78, -3685.61, 256.946, 100.0, 0, 2),
+(@PATH, 20, -6473.28, -3676.01, 252.08100000000002, 100.0, 0, 2),
+(@PATH, 21, -6480.76, -3664.51, 247.527, 100.0, 0, 2),
+(@PATH, 22, -6473.49, -3647.55, 244.618, 100.0, 0, 2),
+(@PATH, 23, -6445.15, -3633.09, 254.014, 100.0, 0, 2),
+(@PATH, 24, -6429.45, -3627.02, 257.59, 100.0, 0, 2),
+(@PATH, 25, -6408.34, -3626.71, 250.96, 100.0, 0, 2),
+(@PATH, 26, -6388.21, -3641.88, 242.295, 100.0, 0, 2),
+(@PATH, 27, -6362.36, -3647.93, 242.31, 100.0, 0, 2),
+(@PATH, 28, -6354.91, -3614.21, 242.14, 100.0, 0, 2),
+(@PATH, 29, -6371.3, -3594.98, 247.97, 100.0, 0, 2),
+(@PATH, 30, -6395.35, -3586.23, 270.905, 100.0, 0, 2);
+
+/*  Starving Buzzard - GUID 7607  */
+
+
+SET @NPC := 7607;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6547.11, `position_y` = -3590.26, `position_z` = 263.315, `orientation` = 5.2796 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6546.91, -3612.78, 252.546, 100.0, 0, 2),
+(@PATH, 2, -6567.01, -3630.33, 242.39, 100.0, 0, 2),
+(@PATH, 3, -6596.16, -3615.76, 241.792, 100.0, 0, 2),
+(@PATH, 4, -6621.69, -3592.92, 242.001, 100.0, 0, 2),
+(@PATH, 5, -6643.48, -3599.43, 241.792, 100.0, 0, 2),
+(@PATH, 6, -6653.5, -3629.29, 242.042, 100.0, 0, 2),
+(@PATH, 7, -6665.13, -3654.09, 252.755, 100.0, 0, 2),
+(@PATH, 8, -6655.26, -3666.55, 258.265, 100.0, 0, 2),
+(@PATH, 9, -6648.55, -3671.17, 262.686, 100.0, 0, 2),
+(@PATH, 10, -6634.89, -3676.32, 264.832, 100.0, 0, 2),
+(@PATH, 11, -6615.17, -3681.26, 265.56, 100.0, 0, 2),
+(@PATH, 12, -6593.81, -3698.81, 268.281, 100.0, 0, 2),
+(@PATH, 13, -6571.59, -3703.16, 273.226, 100.0, 0, 2),
+(@PATH, 14, -6547.1, -3700.65, 272.422, 100.0, 0, 2),
+(@PATH, 15, -6571.59, -3703.16, 273.226, 100.0, 0, 2),
+(@PATH, 16, -6593.81, -3698.81, 268.281, 100.0, 0, 2),
+(@PATH, 17, -6615.17, -3681.26, 265.56, 100.0, 0, 2),
+(@PATH, 18, -6634.89, -3676.32, 264.832, 100.0, 0, 2),
+(@PATH, 19, -6648.55, -3671.17, 262.686, 100.0, 0, 2),
+(@PATH, 20, -6655.26, -3666.55, 258.265, 100.0, 0, 2),
+(@PATH, 21, -6665.13, -3654.09, 252.755, 100.0, 0, 2),
+(@PATH, 22, -6653.5, -3629.29, 242.042, 100.0, 0, 2),
+(@PATH, 23, -6643.48, -3599.43, 241.792, 100.0, 0, 2),
+(@PATH, 24, -6621.69, -3592.92, 242.001, 100.0, 0, 2),
+(@PATH, 25, -6596.16, -3615.76, 241.792, 100.0, 0, 2),
+(@PATH, 26, -6567.01, -3630.33, 242.39, 100.0, 0, 2),
+(@PATH, 27, -6546.91, -3612.78, 252.546, 100.0, 0, 2),
+(@PATH, 28, -6545.3, -3593.11, 262.506, 100.0, 0, 2);
+
+/*  Buzzard - GUID 7614  */
+
+
+SET @NPC := 7614;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6787.12, `position_y` = -3653.08, `position_z` = 247.035, `orientation` = 2.40914 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6772.58, -3640.43, 243.189, 100.0, 0, 2),
+(@PATH, 2, -6754.54, -3631.1, 241.749, 100.0, 0, 2),
+(@PATH, 3, -6755.22, -3618.73, 241.749, 100.0, 0, 2),
+(@PATH, 4, -6752.14, -3604.26, 242.05, 100.0, 0, 2),
+(@PATH, 5, -6737.61, -3596.97, 242.547, 100.0, 0, 2),
+(@PATH, 6, -6721.14, -3587.47, 242.711, 100.0, 0, 2),
+(@PATH, 7, -6716.05, -3564.79, 243.176, 100.0, 0, 2),
+(@PATH, 8, -6688.82, -3544.26, 242.138, 100.0, 0, 2),
+(@PATH, 9, -6661.65, -3516.61, 247.939, 100.0, 0, 2),
+(@PATH, 10, -6658.14, -3483.01, 257.019, 100.0, 0, 2),
+(@PATH, 11, -6648.16, -3458.14, 261.122, 100.0, 0, 2),
+(@PATH, 12, -6658.12, -3412.55, 258.497, 100.0, 0, 2),
+(@PATH, 13, -6648.16, -3458.14, 261.122, 100.0, 0, 2),
+(@PATH, 14, -6658.14, -3483.01, 257.019, 100.0, 0, 2),
+(@PATH, 15, -6661.65, -3516.61, 247.939, 100.0, 0, 2),
+(@PATH, 16, -6688.82, -3544.26, 242.138, 100.0, 0, 2),
+(@PATH, 17, -6715.98, -3564.71, 243.138, 100.0, 0, 2),
+(@PATH, 18, -6721.04, -3587.42, 242.62, 100.0, 0, 2),
+(@PATH, 19, -6737.61, -3596.97, 242.547, 100.0, 0, 2),
+(@PATH, 20, -6752.14, -3604.26, 242.05, 100.0, 0, 2),
+(@PATH, 21, -6755.22, -3618.73, 241.749, 100.0, 0, 2),
+(@PATH, 22, -6754.54, -3631.1, 241.749, 100.0, 0, 2),
+(@PATH, 23, -6772.58, -3640.43, 243.189, 100.0, 0, 2),
+(@PATH, 24, -6787.63, -3652.62, 247.154, 100.0, 0, 2);
+
+/*  Starving Buzzard - GUID 7705  */
+
+
+SET @NPC := 7705;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6344.17, `position_y` = -3295.69, `position_z` = 262.754, `orientation` = 4.18879 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6337.79, -3317.69, 249.862, 100.0, 0, 2),
+(@PATH, 2, -6348.75, -3332.36, 242.44, 100.0, 0, 2),
+(@PATH, 3, -6344.74, -3365.74, 241.792, 100.0, 0, 2),
+(@PATH, 4, -6317.13, -3396.21, 240.141, 100.0, 0, 2),
+(@PATH, 5, -6285.82, -3419.93, 239.051, 100.0, 0, 2),
+(@PATH, 6, -6253.66, -3436.98, 237.79, 100.0, 0, 2),
+(@PATH, 7, -6237.7, -3458.54, 239.34, 100.0, 0, 2),
+(@PATH, 8, -6251.97, -3473.62, 246.596, 100.0, 0, 2),
+(@PATH, 9, -6270.89, -3486.68, 252.644, 100.0, 0, 2),
+(@PATH, 10, -6294.5, -3496.35, 250.91, 100.0, 0, 2),
+(@PATH, 11, -6313.64, -3498.86, 246.061, 100.0, 0, 2),
+(@PATH, 12, -6342.42, -3506.43, 241.834, 100.0, 0, 2),
+(@PATH, 13, -6357.96, -3521.32, 246.796, 100.0, 0, 2),
+(@PATH, 14, -6371.56, -3543.19, 259.244, 100.0, 0, 2),
+(@PATH, 15, -6357.96, -3521.32, 246.796, 100.0, 0, 2),
+(@PATH, 16, -6342.42, -3506.43, 241.834, 100.0, 0, 2),
+(@PATH, 17, -6313.64, -3498.86, 246.061, 100.0, 0, 2),
+(@PATH, 18, -6294.5, -3496.35, 250.91, 100.0, 0, 2),
+(@PATH, 19, -6270.89, -3486.68, 252.644, 100.0, 0, 2),
+(@PATH, 20, -6251.97, -3473.62, 246.596, 100.0, 0, 2),
+(@PATH, 21, -6237.7, -3458.54, 239.34, 100.0, 0, 2),
+(@PATH, 22, -6253.66, -3436.98, 237.79, 100.0, 0, 2),
+(@PATH, 23, -6285.82, -3419.93, 239.051, 100.0, 0, 2),
+(@PATH, 24, -6317.13, -3396.21, 240.141, 100.0, 0, 2),
+(@PATH, 25, -6344.74, -3365.74, 241.792, 100.0, 0, 2),
+(@PATH, 26, -6348.75, -3332.36, 242.44, 100.0, 0, 2),
+(@PATH, 27, -6337.79, -3317.69, 249.862, 100.0, 0, 2),
+(@PATH, 28, -6348.47, -3296.53, 262.444, 100.0, 0, 2);
+
+/*  Starving Buzzard - GUID 7706  */
+
+
+SET @NPC := 7706;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6293.02, `position_y` = -3540.83, `position_z` = 255.493, `orientation` = 6.0912 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6309.64, -3551.04, 250.121, 100.0, 0, 2),
+(@PATH, 2, -6330.5, -3565.26, 242.258, 100.0, 0, 2),
+(@PATH, 3, -6356.39, -3578.34, 244.417, 100.0, 0, 2),
+(@PATH, 4, -6360.57, -3601.59, 241.869, 100.0, 0, 2),
+(@PATH, 5, -6363.55, -3635.48, 241.792, 100.0, 0, 2),
+(@PATH, 6, -6383.01, -3653.02, 243.271, 100.0, 0, 2),
+(@PATH, 7, -6400.48, -3665.74, 243.501, 100.0, 0, 2),
+(@PATH, 8, -6423.64, -3669.32, 243.821, 100.0, 0, 2),
+(@PATH, 9, -6449.26, -3667.73, 243.82, 100.0, 0, 2),
+(@PATH, 10, -6473.78, -3659.77, 245.28, 100.0, 0, 2),
+(@PATH, 11, -6486.57, -3671.69, 252.15499999999997, 100.0, 0, 2),
+(@PATH, 12, -6473.78, -3659.77, 245.28, 100.0, 0, 2),
+(@PATH, 13, -6449.26, -3667.73, 243.82, 100.0, 0, 2),
+(@PATH, 14, -6423.64, -3669.32, 243.821, 100.0, 0, 2),
+(@PATH, 15, -6400.48, -3665.74, 243.501, 100.0, 0, 2),
+(@PATH, 16, -6383.01, -3653.02, 243.271, 100.0, 0, 2),
+(@PATH, 17, -6363.55, -3635.48, 241.792, 100.0, 0, 2),
+(@PATH, 18, -6360.57, -3601.59, 241.869, 100.0, 0, 2),
+(@PATH, 19, -6356.46, -3578.38, 244.332, 100.0, 0, 2),
+(@PATH, 20, -6330.5, -3565.26, 242.258, 100.0, 0, 2),
+(@PATH, 21, -6309.64, -3551.04, 250.121, 100.0, 0, 2),
+(@PATH, 22, -6293.6, -3543.78, 254.57100000000003, 100.0, 0, 2);
+
+/*  Starving Buzzard - GUID 7724  */
+
+
+SET @NPC := 7724;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6118.22, `position_y` = -3446.35, `position_z` = 263.376, `orientation` = 1.68663 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6135.86, -3430.15, 250.7, 100.0, 0, 2),
+(@PATH, 2, -6152.67, -3417.56, 244.799, 100.0, 0, 2),
+(@PATH, 3, -6165.62, -3391.81, 243.028, 100.0, 0, 2),
+(@PATH, 4, -6181.44, -3386.96, 241.163, 100.0, 0, 2),
+(@PATH, 5, -6213.01, -3381.29, 239.398, 100.0, 0, 2),
+(@PATH, 6, -6245.12, -3387.58, 239.271, 100.0, 0, 2),
+(@PATH, 7, -6266.66, -3407.41, 239.168, 100.0, 0, 2),
+(@PATH, 8, -6278.52, -3423.51, 238.746, 100.0, 0, 2),
+(@PATH, 9, -6314.57, -3442.77, 239.492, 100.0, 0, 2),
+(@PATH, 10, -6337.46, -3462.88, 241.753, 100.0, 0, 2),
+(@PATH, 11, -6347.84, -3477.28, 241.86, 100.0, 0, 2),
+(@PATH, 12, -6338.71, -3515.47, 241.834, 100.0, 0, 2),
+(@PATH, 13, -6333.27, -3534.63, 241.685, 100.0, 0, 2),
+(@PATH, 14, -6307.21, -3550.54, 250.302, 100.0, 0, 2),
+(@PATH, 15, -6286.62, -3543.03, 258.238, 100.0, 0, 2),
+(@PATH, 16, -6307.21, -3550.54, 250.302, 100.0, 0, 2),
+(@PATH, 17, -6333.27, -3534.63, 241.685, 100.0, 0, 2),
+(@PATH, 18, -6338.71, -3515.47, 241.834, 100.0, 0, 2),
+(@PATH, 19, -6347.84, -3477.28, 241.86, 100.0, 0, 2),
+(@PATH, 20, -6337.46, -3462.88, 241.753, 100.0, 0, 2),
+(@PATH, 21, -6314.57, -3442.77, 239.492, 100.0, 0, 2),
+(@PATH, 22, -6278.52, -3423.51, 238.746, 100.0, 0, 2),
+(@PATH, 23, -6266.66, -3407.41, 239.168, 100.0, 0, 2),
+(@PATH, 24, -6245.12, -3387.58, 239.271, 100.0, 0, 2),
+(@PATH, 25, -6213.01, -3381.29, 239.398, 100.0, 0, 2),
+(@PATH, 26, -6181.51, -3386.97, 241.042, 100.0, 0, 2),
+(@PATH, 27, -6165.62, -3391.81, 243.028, 100.0, 0, 2),
+(@PATH, 28, -6152.73, -3417.5, 244.855, 100.0, 0, 2),
+(@PATH, 29, -6135.91, -3430.1, 250.674, 100.0, 0, 2),
+(@PATH, 30, -6118.29, -3445.71, 263.008, 100.0, 0, 2);
+
+/*  Shadowforge Digger - GUID 7736  */
+
+
+SET @NPC := 7736;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature_addon` set `path_id` = @PATH WHERE `guid` = @NPC;
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`) VALUES
+(@PATH, 1, -6116.14, -3006.02, 223.452, 100.0, 45000),
+(@PATH, 2, -6123.77, -3009.48, 221.833, 2.9947, 45000);
+
+/*  Starving Buzzard - GUID 7796  */
+
+
+SET @NPC := 7796;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature` SET `position_x` = -6363.76, `position_y` = -3508.55, `position_z` = 246.23, `orientation` = 5.96903 WHERE `guid` = @NPC;
+
+DELETE FROM `creature_addon` WHERE `guid` = @NPC;
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`) VALUES
+(@PATH, 1, -6368.26, -3466.82, 244.829, 100.0, 0, 2),
+(@PATH, 2, -6362.57, -3443.06, 241.753, 100.0, 0, 2),
+(@PATH, 3, -6345.93, -3416.62, 241.559, 100.0, 0, 2),
+(@PATH, 4, -6313.67, -3401.18, 239.946, 100.0, 0, 2),
+(@PATH, 5, -6285.39, -3406.43, 239.255, 100.0, 0, 2),
+(@PATH, 6, -6257.33, -3442.1, 237.983, 100.0, 0, 2),
+(@PATH, 7, -6238.56, -3451.22, 238.124, 100.0, 0, 2),
+(@PATH, 8, -6210.24, -3438.81, 238.298, 100.0, 0, 2),
+(@PATH, 9, -6198.03, -3408.55, 239.194, 100.0, 0, 2),
+(@PATH, 10, -6192.33, -3386.96, 239.292, 100.0, 0, 2),
+(@PATH, 11, -6174.5, -3369.47, 245.401, 100.0, 0, 2),
+(@PATH, 12, -6149.01, -3369.75, 244.548, 100.0, 0, 2),
+(@PATH, 13, -6174.5, -3369.47, 245.401, 100.0, 0, 2),
+(@PATH, 14, -6192.33, -3386.96, 239.292, 100.0, 0, 2),
+(@PATH, 15, -6198.03, -3408.55, 239.194, 100.0, 0, 2),
+(@PATH, 16, -6210.24, -3438.81, 238.298, 100.0, 0, 2),
+(@PATH, 17, -6238.56, -3451.22, 238.124, 100.0, 0, 2),
+(@PATH, 18, -6257.33, -3442.1, 237.983, 100.0, 0, 2),
+(@PATH, 19, -6285.39, -3406.43, 239.255, 100.0, 0, 2),
+(@PATH, 20, -6313.67, -3401.18, 239.946, 100.0, 0, 2),
+(@PATH, 21, -6345.93, -3416.62, 241.559, 100.0, 0, 2),
+(@PATH, 22, -6362.57, -3443.06, 241.753, 100.0, 0, 2),
+(@PATH, 23, -6368.25, -3466.71, 244.777, 100.0, 0, 2),
+(@PATH, 24, -6360.65, -3507.1, 244.52, 100.0, 0, 2);
+
+/*  Shadowforge Ruffian - GUID 9230  */
+
+
+SET @NPC := 9230;
+SET @PATH := @NPC * 10;
+
+UPDATE `creature_addon` set `path_id` = @PATH WHERE `guid` = @NPC;
+UPDATE `creature` SET `MovementType` = 2 WHERE `guid` = @NPC;
+
+DELETE FROM `waypoint_data` where `id` = @PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`) VALUES
+(@PATH, 1, -6071.02, -3133.92, 254.006, 100.0, 0),
+(@PATH, 2, -6067.03, -3134.64, 253.744, 100.0, 0),
+(@PATH, 3, -6069.15, -3137.9, 254.253, 100.0, 0),
+(@PATH, 4, -6076.13, -3133.62, 253.989, 100.0, 0),
+(@PATH, 5, -6080.28, -3131.97, 253.426, 100.0, 0),
+(@PATH, 6, -6084.9, -3130.2, 253.631, 100.0, 0),
+(@PATH, 7, -6088.52, -3124.03, 252.514, 100.0, 0),
+(@PATH, 8, -6089.38, -3117.48, 251.538, 100.0, 0),
+(@PATH, 9, -6089.48, -3111.04, 251.394, 100.0, 0),
+(@PATH, 10, -6089.52, -3106.35, 250.837, 100.0, 0),
+(@PATH, 11, -6089.07, -3114.42, 251.377, 100.0, 0),
+(@PATH, 12, -6088.68, -3121.53, 252.032, 100.0, 0),
+(@PATH, 13, -6087.68, -3126.75, 253.098, 100.0, 0),
+(@PATH, 14, -6085.5, -3129.51, 253.555, 100.0, 0),
+(@PATH, 15, -6080.6, -3130.18, 253.74, 100.0, 0),
+(@PATH, 16, -6076.07, -3130.61, 254.185, 100.0, 0);