diff --git a/ACID/acid_tbc.sql b/ACID/acid_tbc.sql
index cb9501e4c..d874b2e5e 100644
--- a/ACID/acid_tbc.sql
+++ b/ACID/acid_tbc.sql
@@ -18826,12 +18826,8 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Scrap Reaver X6000 (19849) - npc_scrap_reaver
 -- Negatron 19851 - creature_spell_list
 ('1985101','19851','11','0','100','0','0','0','0','0','0','0','11','34427','0','0','0','0','0','0','0','0','0','0','Negatron - Cast Ethereal Teleport on Spawn'),
--- Artifact Seeker 19852
-('1985201','19852','0','0','100','1025','6000','14000','18000','20000','0','0','11','11981','16','512','0','0','0','0','0','0','0','0','Artifact Seeker - Cast Mana Burn on Random Player Mana User'),
-('1985202','19852','0','0','100','1025','8000','17000','19000','30000','0','0','11','30849','16','512','0','0','0','0','0','0','0','0','Artifact Seeker - Cast Spell Lock on Random Player Mana User'),
--- Felblade Doomguard 19853
-('1985301','19853','0','0','100','1025','13000','22000','22000','32000','0','0','11','32736','1','0','0','0','0','0','0','0','0','0','Felblade Doomguard - Cast Mortal Strike'),
-('1985302','19853','0','0','100','1025','8000','12000','16000','21000','0','0','11','35238','1','0','0','0','0','0','0','0','0','0','Felblade Doomguard - Cast War Stomp'),
+-- Artifact Seeker 19852 - spell_list
+-- Felblade Doomguard 19853 - spell_list
 -- Nether-Stalker Khay'ji 19880
 ('1988001','19880','30','0','100','1','5','19570','0','0','0','0','53','-10172','0','0','0','0','0','0','0','0','0','0','Nether-Stalker Khay''ji - Start Relay Script (Random Emote) on Receive AI Event 5'),
 -- Severed Spirit 19881
@@ -18977,9 +18973,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Shaleskin Flayer
 ('2021001','20210','1','0','100','1','1000','5000','1000','10000','0','0','11','36576','0','34','0','0','0','0','0','0','0','0','Shaleskin Flayer - Cast Shaleskin OOC'),
 ('2021002','20210','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Shaleskin Flayer - Flee at 15% HP'),
--- Pentatharon
-('2021501','20215','0','0','100','1025','5000','8500','7400','12500','0','0','11','36039','1','0','0','0','0','0','0','0','0','0','Pentatharon - Cast Carrion Swarm'),
-('2021502','20215','0','0','100','1025','5000','10000','25000','30000','0','0','11','20663','5','0','0','0','0','0','0','0','0','0','Pentatharon - Cast Sleep'),
+-- Pentatharon 20215 - spell_list
 -- Sunfury Technician 20218 - npc_manaforge_spawn
 ('2021801','20218','4','0','100','0','0','0','0','0','0','0','52','3','0','0','0','0','0','0','0','0','0','0','Sunfury Technician - Interrupt Channelling on Aggro'),
 -- Sunfury Flamekeeper 20221
diff --git a/Updates/0528_netherstorm_south_east_island.sql b/Updates/0528_netherstorm_south_east_island.sql
index 4ecb9ad73..5fd9e14a2 100644
--- a/Updates/0528_netherstorm_south_east_island.sql
+++ b/Updates/0528_netherstorm_south_east_island.sql
@@ -11,9 +11,15 @@ SET @CGUID := 5306100; -- creatures
 SET @SGGUID := 5306000; -- spawn_groups
  
  
-DELETE FROM creature WHERE guid IN (67423, 67424, 67425, 67426, 67427, 67428, 67429, 67430, 67431, 67432, 67434, 67435, 67436, 67437, 67438,  67439, 67440, 67441, 67442, 67443, 67444, 67445, 67516, 67517, 67518, 67519, 67520, 67521, 67522, 67523, 67524, 67525, 67526, 67527, 67528, 67529, 67530, 67531, 67532, 67533, 67534, 67535, 67536, 67537, 67538, 67539, 67540, 67541, 67542, 67543, 67544, 67545, 67546, 67547, 67548, 67549, 67550, 67551, 67552, 67553, 67554, 67555, 67556, 67557, 67615, 67616, 67617, 67618, 67619, 67620, 67621, 67622, 67623, 67624, 67625, 67626, 67675, 67676, 67677, 67694, 67695, 67696, 67697, 67732, 
-70008, 71807, 71808, 71809, 71810, 71811, 71812, 71813, 71814, 71815, 71816, 71817, 71818, 71819, 71839, 71840, 71841, 71842, 71844, 71845, 71846, 71849, 71850, 72537, 73962, 73963, 73964, 73965, 1002671, 1002675, 1002679);
-DELETE FROM creature WHERE guid BETWEEN @CGUID+1 AND @CGUID+65;
+DELETE FROM creature WHERE guid IN (67423, 67424, 67425, 67426, 67427, 67428, 67429, 67430, 67431, 67432, 67434, 67435, 67436, 67437, 67438,  67439, 67440, 67441, 67442, 67443, 67444, 67445, 67516, 67517, 67518, 67519, 67520, 67521, 67522, 67523, 67524, 67525, 67526, 67527, 67528, 67529, 67530, 67531, 67532, 67533, 67534, 67535, 67536, 67537, 67538, 67539, 67540, 67541, 67542, 67543, 67544, 67545, 67546, 67547, 67548, 67549, 67550, 67551, 67552, 67553, 67554, 67555, 67556, 67557, 67615, 67616, 67617, 67618, 67619, 67620, 67621, 67622, 67623, 67624, 67625, 67626, 67631, 67632, 67633, 67634, 67635, 67636, 67675, 67676, 67677, 67684, 67685, 67686, 67687, 67688, 67689, 67694, 67695, 67696, 67697, 67732, 
+70008, 71807, 71808, 71809, 71810, 71811, 71812, 71813, 71814, 71815, 71816, 71817, 71818, 71819, 71839, 71840, 71841, 71842, 71843, 71844, 71845, 71846, 71849, 71850, 71886, 71890, 72537, 73962, 73963, 73964, 73965, 1002671, 1002675, 1002679, 1002703); 
+-- Delete all Farahlon Giant, Farahlon Crumbler (only spawn on Giant death) spanws
+-- Old guids: 67834, 67833, 67835, 67836, 75856, 75559, 67832
+-- Delete all Artifact Seeker (12 spawns)
+-- Delete all Fellade Doomguard spawns
+-- Delete Pentatharon spawn
+DELETE FROM creature WHERE id IN (18885, 19852,  19853, 20215, 21077);
+DELETE FROM creature WHERE guid BETWEEN @CGUID+1 AND @CGUID+179;
 INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecsmin`, `spawntimesecsmax`, `spawndist`, `MovementType`) VALUES
 -- Nether Technician
 (@CGUID+1, 20203, 530, 1, 3380.88, 4359.49, 123.702, 4.67748, 300, 300, 0, 0),
@@ -74,37 +80,24 @@ INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `position_x`, `positio
 (@CGUID+43, 0, 530, 1, 3573.5, 3647.71, 131.662, 0.799555, 300, 360, 8, 1),  -- spawn_group_entry old guid 67518
 
 (@CGUID+44, 18872, 530, 1, 3584.14, 3595.16, 130.009, 5.36131, 300, 360, 8, 1),  -- Disembodied Vindicator old guid 67524
-
 (@CGUID+45, 18872, 530, 1, 3575.31, 3548.73, 127.209, 5.58143, 300, 360, 8, 1),  -- Disembodied Vindicator old guid 67525
 (@CGUID+46, 18873, 530, 1, 3551.81, 3525.41, 124.929, 0.497076, 360, 420, 8, 1), -- Disembodied Protector old guid 67544
 (@CGUID+47, 18873, 530, 1, 3527.85, 3549.21, 137.595, 5.68976, 360, 420, 8, 1), -- Disembodied Protector old guid 67543
 (@CGUID+48, 0, 530, 1, 3516.86, 3525.74, 131.554, 4.6102, 360, 420, 8, 1), -- spawn_group_entry old guid 67546
-
 -- Ruins of Enkaat entrance 
 (@CGUID+49, 21058, 530, 1, 3374.26, 3712.78, 142.87, 5.6495, 300, 360, 0, 4), -- Disembodied Exarch old guid 73962
-
 (@CGUID+50, 0, 530, 1, 3410.26, 3684.18, 147.597, 4.67748, 360, 420, 0, 0), -- spawn_group_entry old guid 67556
 (@CGUID+51, 18872, 530, 1, 3409.75, 3673.84, 148.697, 1.46608, 300, 360, 0, 0), -- Disembodied Vindicator old guid 67536
-
 (@CGUID+52, 18872, 530, 1, 3463.16, 3715.29, 145.986, 0.804, 300, 360, 0, 4), -- Disembodied Vindicator old guid 67517
--- ToDO: this npc should rnd switch between standstate 0 (stand) 1 (sit) and 3 (sleep) also should use STATE_USESTANDING_NOSHEATHE at some point will add later
 (@CGUID+53, 0, 530, 1, 3449.43, 3702.6, 147.646, 3.78736, 300, 360, 0, 0), -- spawn_group_entry old guid 67541
--- prob same as above - todo..
 (@CGUID+54, 18872, 530, 1, 3424.25, 3661.14, 153.203, 4.46804, 300, 360, 0, 0), -- Disembodied Vindicator old guid 67537--  
 (@CGUID+55, 18873, 530, 1, 3369.44, 3661.99, 143.635, 4.01426, 300, 360, 0, 0), -- Disembodied Protector old guid 67554
--- Npc before bridge
 (@CGUID+56, 18872, 530, 1, 3455.16, 3675.74, 150.064, 0.39114, 300, 360, 14, 1), -- Disembodied Vindicator old guid 67521
--- Exarch patroling from left under the bridge
 (@CGUID+57, 21058, 530, 1, 3493.2, 3717.37, 139.938, 5.39578, 300, 360, 0, 4), -- Disembodied Exarch old guid 73964
--- NPC patroling on the bridge
 (@CGUID+58, 18872, 530, 1, 3468.76, 3646.23, 154.458, 5.42845, 300, 360, 0, 2), -- Disembodied Vindicator old guid 67522
--- Random movement under bridge
 (@CGUID+59, 18872, 530, 1, 3458.56, 3627.43, 140.747, 1.7571, 300, 360, 15, 1), -- Disembodied Vindicator old guid 67523
--- Crater from the bridge right
 (@CGUID+60, 0, 530, 1, 3432.5, 3591.81, 144.274, 2.11479, 300, 360, 10, 1), -- spawn_group_entry old guid 67549
--- npc with rnd emote/standstate
 (@CGUID+61, 18872, 530, 1, 3412.48, 3609.1, 140.999, 0.785398, 300, 360, 0, 0), -- Disembodied Vindicator old guid 67535
--- 4 npcs outside right from entrace
 (@CGUID+62, 18873, 530, 1, 3343.02, 3682.69, 135.465, 4.66549, 300, 360, 8, 1), -- Disembodied Protector old guid 67555
 (@CGUID+63, 18872, 530, 1, 3349.59, 3647.52, 142.912, 3.58056, 300, 360, 10, 1), -- Disembodied Vindicator old guid 67534
 (@CGUID+64, 18873, 530, 1, 3382.97, 3646.03, 144.754, 4.86133, 300, 360, 0, 0), -- Disembodied Protector old guid 67552
@@ -182,10 +175,69 @@ INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `position_x`, `positio
 (@CGUID+127, 18881, 530, 1, 3164.351, 3385.3452, 100.7853, 1.1868, 360, 420, 0, 4), -- Sundered Rumbler old guid 67695
 
 (@CGUID+128, 18880, 530, 1, 3112.22, 3550.12, 140.615, 0.281358, 360, 420, 0, 4), -- Nether Ray guid before 67677
-(@CGUID+129, 18880, 530, 1, 3188.54, 3356.01, 103.683, 4.15397, 360, 420, 0, 2); -- Nether Ray guid before 67676
+(@CGUID+129, 18880, 530, 1, 3188.54, 3356.01, 103.683, 4.15397, 360, 420, 0, 2), -- Nether Ray guid before 67676
+
+(@CGUID+130, 20210, 530, 1, 3004.71, 3369.09, 104.646, 5.28046, 360, 420, 4, 1), -- Shaleskin Flayer guid before 71890
+(@CGUID+131, 20210, 530, 1, 2990.35, 3426.19, 106.054, 2.67338, 360, 420, 4, 1), -- Shaleskin Flayer missing before
+(@CGUID+132, 20210, 530, 1, 2924.86, 3396.3, 105.731, 1.75946, 360, 420, 4, 1), -- Shaleskin Flayer missing before
+(@CGUID+133, 20210, 530, 1, 3055.42, 3240.19, 118.1, 4.38068, 360, 420, 4, 1), -- Shaleskin Flayer guid before 71843
+
+-- Farahlon Giants having a fast respawn timer
+(@CGUID+134, 18885, 530, 1, 3020.59, 3193.82, 120.721, 4.94689, 120, 300, 6, 1), -- Farahlon Giant
+(@CGUID+135, 18885, 530, 1, 2988.63, 3311.06, 143.871, 6.10842, 120, 300, 6, 1), -- Farahlon Giant
+(@CGUID+136, 18885, 530, 1, 2951.19, 3303.02, 154.342, 1.59422, 120, 300, 6, 1), -- Farahlon Giant
+(@CGUID+137, 18885, 530, 1, 2956.06, 3217.67, 146.699, 5.26936, 120, 300, 6, 1), -- Farahlon Giant
+(@CGUID+138, 18885, 530, 1, 2882.91, 3204.03, 173.905, 1.23877, 120, 300, 6, 1), -- Farahlon Giant
+(@CGUID+139, 18885, 530, 1, 2964.57, 3130.3, 126.159, 5.24058, 120, 300, 6, 1), -- Farahlon Giant
+-- Artifact Seeker
+(@CGUID+140, 19852, 530, 1, 2804.11, 3347.12, 146.058, 4.0177, 300, 420, 5, 1), -- Artifact Seeker old guid 70977
+(@CGUID+141, 19852, 530, 1, 2807.05, 3292.72, 148.29, 0.10472, 300, 420, 5, 1), -- Artifact Seeker missing before
+(@CGUID+142, 19852, 530, 1, 2753.63, 3284.51, 134.762, 0.471291, 300, 420, 5, 1), -- Artifact Seeker old guid 70978
+(@CGUID+143, 19852, 530, 1, 2808.95, 3220.54, 146.282, 5.94395, 300, 420, 5, 1), -- Artifact Seeker old guid 70988
+(@CGUID+144, 19852, 530, 1, 2747.15, 3248.75, 148.674, 2.7317, 300, 420, 5, 1), -- Artifact Seeker old guid 70985
+(@CGUID+145, 19852, 530, 1, 2697.51, 3225.41, 147.612, 0.492836, 300, 420, 0, 2), -- Artifact Seeker old guid 70979
+(@CGUID+146, 19852, 530, 1, 2699.68, 3183.12, 148.722, 1.18508, 300, 420, 5, 1), -- Artifact Seeker old guid 70980
+(@CGUID+147, 19852, 530, 1, 2783.62, 3152.21, 149.823, 6.00323, 300, 420, 5, 1), -- Artifact Seeker old guid 70984
+(@CGUID+148, 19852, 530, 1, 2785.1, 3129, 154.393, 6.27341, 300, 420, 5, 1), -- Artifact Seeker old guid 70987
+(@CGUID+149, 19852, 530, 1, 2749.16, 3151.68, 148.895, 2.4461, 300, 420, 5, 1), -- Artifact Seeker old guid 70982
+(@CGUID+150, 19852, 530, 1, 2735.35, 3132.77, 151.443, 4.24385, 300, 420, 5, 1), -- Artifact Seeker old guid 70983
+(@CGUID+151, 19852, 530, 1, 2683.56, 3116.09, 131.576, 2.16225, 300, 420, 5, 1), -- Artifact Seeker old guid 70981
+(@CGUID+152, 19852, 530, 1, 2738.3, 3194.74, 148.599, 2.0668, 300, 420, 5, 1), -- Artifact Seeker old guid 70986
+(@CGUID+153, 19852, 530, 1, 2784.88, 3195.01, 147.697, 0.513361, 300, 420, 5, 1), -- Artifact Seeker missing before
+-- Fellade Doomguard
+(@CGUID+154, 19853, 530, 1, 2844.86, 3279.39, 136.701, 0.383972, 360, 420, 0, 4), -- Fellade Doomguard old guid 70989
+(@CGUID+155, 19853, 530, 1, 2805.83, 3374.91, 142.815, 1.56005, 360, 420, 0, 4), -- Fellade Doomguard old guid 70993
+(@CGUID+156, 19853, 530, 1, 2774.34, 3293.61, 134.902, 0.925873, 360, 420, 0, 4), -- Fellade Doomguard old guid 70990
+(@CGUID+157, 19853, 530, 1, 2767.29, 3120.06, 153.685, 2.06185, 360, 420, 0, 4), -- Fellade Doomguard old guid 70992
+(@CGUID+158, 19853, 530, 1, 2670.44, 3107.22, 129.567, 0.471239, 360, 420, 0, 4), -- Fellade Doomguard old guid 1002708
+(@CGUID+159, 19853, 530, 1, 2667.65, 3128.15, 136.007, 4.13643, 360, 420, 0, 4), -- Fellade Doomguard old guid 70991
+(@CGUID+160, 19853, 530, 1, 2788.5, 3058.51, 127.074, 0.672188, 360, 420, 0, 4), -- Fellade Doomguard old guid 70994
+
+(@CGUID+161, 20215, 530, 1,  2752.2, 3116.26, 155.687, 0.994838, 300, 420, 0, 0), -- Pentatharon guid before 71898
+
+(@CGUID+162, 20210, 530, 1,  2687.15, 3339.43, 135.363, 5.38, 360, 420, 4, 1), -- Shaleskin Flayer guid before 71886
 
-DELETE FROM creature_addon WHERE guid IN (67527, 67530, 67533, 67537, 67540, 67545, 67550, 67541, 70008, 71807, 71808, 71809, 71810, 71811, 71812, 71813, 71814, 71815, 71816, 71817, 71818, 71819);
---  
+(@CGUID+163, 18879, 530, 1, 2930.82, 3003.23, 132.715, 1.88405, 120, 180, 0, 2), -- Phase Hunter guid before 67636
+(@CGUID+164, 18879, 530, 1, 2896.78, 2969.91, 131.094, 2.87416, 120, 180, 0, 2), -- Phase Hunter guid before 67635
+(@CGUID+165, 18879, 530, 1, 2882.31, 2919.06, 113.968, 3.1953, 120, 180, 0, 2), -- Phase Hunter missing before
+(@CGUID+166, 18879, 530, 1, 2872.51, 2880.38, 106.509, 3.08049, 120, 180, 0, 2), -- Phase Hunter missing before
+(@CGUID+167, 18879, 530, 1, 2820.3, 2794.57, 83.2327, 1.72294, 120, 180, 0, 2), -- Phase Hunter missing before
+(@CGUID+168, 18879, 530, 1, 2756.97, 2829.56, 97.8828, 0.72591, 120, 180, 0, 2), -- Phase Hunter guid before 67633
+(@CGUID+169, 18879, 530, 1, 2725.24, 2857.4, 118.093, 0.828344, 120, 180, 0, 2), -- Phase Hunter missing before
+(@CGUID+170, 18879, 530, 1, 2657.38, 2926.52, 112.107, 6.1009, 120, 180, 0, 2), -- Phase Hunter guid before 67634
+(@CGUID+171, 18879, 530, 1, 2666.63, 2975.45, 128.767, 0.118416, 120, 180, 0, 2), -- Phase Hunter guid before 67632
+(@CGUID+172, 18879, 530, 1, 2644.96, 2990.58, 126.522, 0.629447, 120, 180, 0, 2), -- Phase Hunter guid before 67631
+
+(@CGUID+173, 18880, 530, 1, 2791.07, 2869.06, 96.1818, 3.05697, 360, 420, 0, 4), -- Nether Ray guid before 67684
+(@CGUID+174, 18880, 530, 1, 2893.23, 3046.63, 120.373, 0.719749, 360, 420, 0, 4), -- Nether Ray guid before
+(@CGUID+175, 18880, 530, 1, 2864.18, 3100.29, 136.17, 3.04468, 360, 420, 0, 4), -- Nether Ray guid before
+(@CGUID+176, 18880, 530, 1, 2825.26, 3048.39, 129.472, 5.59516, 360, 420, 0, 4), -- Nether Ray guid before
+(@CGUID+177, 18880, 530, 1, 2829.98, 3008.65, 122.736, 4.90478, 360, 420, 0, 4), -- Nether Ray guid before
+(@CGUID+178, 18880, 530, 1, 2778.39, 2967.84, 118.918, 3.63057, 360, 420, 0, 4), -- Nether Ray guid before
+(@CGUID+179, 18880, 530, 1, 2761.63, 2922.39, 117.805, 4.58564, 360, 420, 0, 4); -- Nether Ray guid before
+
+DELETE FROM creature_addon WHERE guid IN (67527, 67530, 67533, 67537, 67540, 67545, 67550, 67541, 70008, 71807, 71808, 71809, 71810, 71811, 71812, 71813, 71814, 71815, 71816, 71817, 71818, 71819, 75856);
+ 
 DELETE FROM creature_addon WHERE guid IN (@CGUID+75, @CGUID+76, @CGUID+77);
 INSERT INTO `creature_addon` (`guid`, `mount`, `stand_state`, `sheath_state`, `emote`, `moveflags`, `auras`) VALUES
 (@CGUID+75, 0, 8, 0, 0, 0, NULL), -- Disembodied Vindicator
@@ -193,8 +245,8 @@ INSERT INTO `creature_addon` (`guid`, `mount`, `stand_state`, `sheath_state`, `e
 (@CGUID+77, 0, 8, 0, 0, 0, NULL); -- Disembodied Protector
 
 -- Waypoints
-DELETE FROM creature_movement WHERE id IN (67522, 67675, 67676, 67677, 67694, 67695, 67696, 67697, 71811, 71814, 72537, 73962, 73963, 73964, 73965, 1002671, 1002675, 1002679);
-DELETE FROM creature_movement WHERE Id BETWEEN @CGUID+1 AND @CGUID+129;
+DELETE FROM creature_movement WHERE id IN (67522, 67675, 67676, 67677, 67684, 67685, 67686, 67687, 67688, 67689, 67694, 67695, 67696, 67697, 70990, 70991, 70992, 70993, 70994, 70989, 71811, 71814, 72537, 73962, 73963, 73964, 73965, 75856, 1002671, 1002675, 1002679, 1002703, 1002708);
+DELETE FROM creature_movement WHERE Id BETWEEN @CGUID+1 AND @CGUID+179;
 INSERT INTO `creature_movement` (`id`, `point`, `PositionX`, `PositionY`, `PositionZ`, `orientation`, `waittime`, `ScriptId`) VALUES
 -- Nether Technician, changing orientation only
 (@CGUID+3, 1, 3383.929,4348.6997,133.66545,0.20943951, 12000, 0), -- waittime between 12 and 15 seconds
@@ -438,7 +490,183 @@ INSERT INTO `creature_movement` (`id`, `point`, `PositionX`, `PositionY`, `Posit
 (@CGUID+129, 8, 3116.6143,3352.0747,106.848785, 100, 0, 0),
 (@CGUID+129, 9, 3141.5247,3368.5256,104.70891, 100, 0, 0),
 (@CGUID+129, 10, 3162.961,3373.5598,103.82034, 100, 0, 0),
-(@CGUID+129, 11, 3186.1711,3369.1282,103.10805, 100, 0, 0);
+(@CGUID+129, 11, 3186.1711,3369.1282,103.10805, 100, 0, 0),
+-- Artifact Seeker
+(@CGUID+145, 1, 2698.4497,3224.8994,147.55943, 100, 0, 0),
+(@CGUID+145, 2, 2697.9292,3211.497,147.57936, 100, 0, 0),
+(@CGUID+145, 3, 2707.0864,3201.8103,147.62085, 100, 0, 0),
+(@CGUID+145, 4, 2696.9895,3202.796,147.5972, 100, 0, 0),
+(@CGUID+145, 5, 2687.2942,3199.399,147.59097, 100, 0, 0),
+(@CGUID+145, 6, 2685.0544,3188.2004,147.23376, 100, 0, 0),
+(@CGUID+145, 7, 2685.4407,3178.1416,147.62683, 100, 0, 0),
+(@CGUID+145, 8, 2696.7942,3167.2158,146.7985, 100, 0, 0),
+(@CGUID+145, 9, 2686.5095,3177.7258,147.5972, 100, 0, 0),
+(@CGUID+145, 10, 2687.0552,3200.1245,147.5209, 100, 0, 0),
+(@CGUID+145, 11, 2695.0852,3219.716,147.27919, 100, 0, 0),
+(@CGUID+145, 12, 2708.8052,3231.4753,147.51425, 100, 0, 0),
+-- Felblade Doomguard
+(@CGUID+154, 1, 2844.5195,3274.3853,136.31494, 100, 0, 0),
+(@CGUID+154, 2, 2847.4883,3293.0107,136.28421, 100, 0, 0),
+(@CGUID+154, 3, 2846.5283,3329.9229,136.35144, 100, 0, 0),
+(@CGUID+154, 4, 2844.6692,3361.5015,138.32826, 100, 0, 0),
+(@CGUID+154, 5, 2834.5315,3372.9739,140.7338, 100, 0, 0),
+(@CGUID+154, 6, 2790.9768,3386.5505,143.25522, 100, 0, 0),
+(@CGUID+154, 7, 2763.7817,3391.451,147.0207, 100, 0, 0),
+-- Felblade Doomguard
+(@CGUID+155, 1, 2805.8696,3378.8674,142.26472, 100, 0, 0),
+(@CGUID+155, 2, 2805.9705,3363.8762,144.40855, 100, 0, 0),
+(@CGUID+155, 3, 2803.093,3341.802,146.30472, 100, 0, 0),
+(@CGUID+155, 4, 2797.7375,3316.09,147.74304, 100, 0, 0),
+(@CGUID+155, 5, 2791.8276,3285.3303,147.58328, 100, 0, 0),
+(@CGUID+155, 6, 2798.7834,3266.615,147.5972, 100, 0, 0),
+(@CGUID+155, 7, 2799.445,3234.606,147.5972, 100, 0, 0),
+(@CGUID+155, 8, 2786.3882,3199.4001,147.24849, 100, 0, 0),
+(@CGUID+155, 9, 2773.5442,3167.466,148.01701, 100, 0, 0),
+-- Felblade Doomguard
+(@CGUID+156, 1, 2776.6716,3296.7078,134.88904, 100, 0, 0),
+(@CGUID+156, 2, 2741.708,3283.103,134.79964, 100, 0, 0),
+(@CGUID+156, 3, 2723.7053,3264.6707,135.10432, 100, 0, 0),
+(@CGUID+156, 4, 2701.3796,3251.3655,133.81161, 100, 0, 0),
+(@CGUID+156, 5, 2671.7886,3241.817,136.13454, 100, 0, 0),
+-- Felblade Doomguard
+(@CGUID+157, 1, 2767.3296,3119.978,153.61285, 100, 0, 0),
+(@CGUID+157, 2, 2760.3508,3133.0457,151.73926, 100, 0, 0),
+(@CGUID+157, 3, 2751.2417,3166.751,147.8679, 100, 0, 0),
+(@CGUID+157, 4, 2737.5063,3197.8433,148.38454, 100, 0, 0),
+(@CGUID+157, 5, 2729.6033,3240.7727,147.5972, 100, 0, 0),
+-- Felblade Doomguard
+(@CGUID+158, 1, 2676.2434,3108.4949,129.68224, 100, 0, 0),
+(@CGUID+158, 2, 2695.884,3152.218,142.57837, 100, 0, 0),
+(@CGUID+158, 3, 2733.9094,3176.8804,147.73102, 100, 0, 0),
+(@CGUID+158, 4, 2767.524,3183.0664,149.01059, 100, 0, 0),
+(@CGUID+158, 5, 2783.0461,3200.549,148.76402, 100, 0, 0),
+(@CGUID+158, 6, 2795.1108,3234.7832,147.5972, 100, 0, 0),
+-- Felblade Doomguard
+(@CGUID+159, 1, 2666.155,3128.539,136.19554, 100, 0, 0),
+(@CGUID+159, 2, 2681.547,3107.0217,129.7392, 100, 0, 0),
+(@CGUID+159, 3, 2714.7917,3083.177,125.97599, 100, 0, 0),
+(@CGUID+159, 4, 2742.4736,3066.7026,126.90543, 100, 0, 0),
+(@CGUID+159, 5, 2771.3164,3055.7148,125.33494, 100, 0, 0),
+-- Felblade Doomguard
+(@CGUID+160, 1, 2789.9812,3059.688,127.22473, 100, 0, 0),
+(@CGUID+160, 2, 2808.2354,3051.4807,129.19807, 100, 0, 0),
+(@CGUID+160, 3, 2828.0496,3064.0322,130.24457, 100, 0, 0),
+(@CGUID+160, 4, 2825.4067,3085.0708,131.07745, 100, 0, 0),
+(@CGUID+160, 5, 2828.7065,3113.5422,132.90123, 100, 0, 0),
+(@CGUID+160, 6, 2834.658,3132.8125,135.12311, 100, 0, 0),
+(@CGUID+160, 7, 2820.653,3168.3298,138.29019, 100, 0, 0),
+-- Phase Hunter
+(@CGUID+163, 1, 2930.82, 3003.23, 132.715, 100, 0, 0),
+(@CGUID+163, 2, 2891.3323,3061.6091,122.360115, 100, 1000, 1887903),
+-- Phase Hunter
+(@CGUID+164, 1, 2896.78, 2969.91, 131.094, 100, 0, 0),
+(@CGUID+164, 2, 2853.805,2980.5447,115.80218, 100, 1000, 1887903),
+-- Phase Hunter
+(@CGUID+165, 1, 2882.31, 2919.06, 113.968, 100, 0, 0),
+(@CGUID+165, 2, 2850.9858, 2915.7764, 103.02588, 100, 1000, 1887903),
+-- Phase Hunter
+(@CGUID+166, 1, 2872.51, 2880.38, 106.509, 100, 0, 0),
+(@CGUID+166, 2, 2811.9316,2878.247,98.02391, 100, 1000, 1887901),
+-- Phase Hunter
+(@CGUID+167, 1, 2820.3, 2794.57, 83.2327, 100, 0, 0),
+(@CGUID+167, 2, 2806.19,2816.1062,68.63162, 100, 1000, 1887902),
+-- Phase Hunter
+(@CGUID+168, 1, 2756.97, 2829.56, 97.8828, 100, 0, 0),
+(@CGUID+168, 2, 2820.3, 2794.57, 83.2327, 100, 1000, 1887903),
+-- Phase Hunter
+(@CGUID+169, 1, 2725.24, 2857.4, 118.093, 100, 0, 0),
+(@CGUID+169, 2, 2746.8564,2891.9375,108.675674, 100, 1000, 1887903),
+-- Phase Hunter
+(@CGUID+170, 1, 2657.38, 2926.52, 112.107, 100, 0, 0),
+(@CGUID+170, 2, 2712.0974,2917.463,102.34863, 100, 1000, 1887903),
+-- Phase Hunter
+(@CGUID+171, 1, 2666.63, 2975.45, 128.767, 100, 0, 0),
+(@CGUID+171, 2, 2709.7305,2972.9805,114.28846, 100, 1000, 1887903),
+-- Phase Hunter
+(@CGUID+172, 1, 2644.96, 2990.58, 126.522, 100, 0, 0),
+(@CGUID+172, 2, 2683.8032,3016.3352,113.83579, 100, 1000, 1887903),
+-- Nether Ray
+(@CGUID+173, 1, 2786.0464,2869.4778,96.072754, 100, 0, 0),
+(@CGUID+173, 2, 2799.0547,2895.908,107.18539, 100, 0, 0),
+(@CGUID+173, 3, 2817.9883,2927.705,116.774, 100, 0, 0),
+(@CGUID+173, 4, 2822.727,2965.4255,115.05098, 100, 0, 0),
+(@CGUID+173, 5, 2834.5608,3001.4707,120.77321, 100, 0, 0),
+(@CGUID+173, 6, 2840.711,3031.622,124.32088, 100, 0, 0),
+(@CGUID+173, 7, 2857.4001,3067.843,129.22284, 100, 0, 0),
+(@CGUID+173, 8, 2899.2007,3080.4536,126.08596, 100, 0, 0),
+-- Nether Ray
+(@CGUID+174, 1, 2906.8477,3058.587,121.953476, 100, 0, 0),
+(@CGUID+174, 2, 2875.8308,3039.1636,124.86011, 100, 0, 0),
+(@CGUID+174, 3, 2855.7458,3001.8254,113.455986, 100, 0, 0),
+(@CGUID+174, 4, 2842.7417,2966.7551,116.37283, 100, 0, 0),
+(@CGUID+174, 5, 2846.1663,2934.3604,101.41328, 100, 0, 0),
+(@CGUID+174, 6, 2833.5637,2902.5715,102.29902, 100, 0, 0),
+(@CGUID+174, 7, 2832.2021,2868.6045,95.06509, 100, 0, 0),
+(@CGUID+174, 8, 2814.3704,2843.557,81.037964, 100, 0, 0),
+(@CGUID+174, 9, 2784.5571,2853.5176,88.99387, 100, 0, 0),
+(@CGUID+174, 10, 2755.287,2889.797,106.88466, 100, 0, 0),
+(@CGUID+174, 11, 2725.994,2908.2332,104.642914, 100, 0, 0),
+(@CGUID+174, 12, 2717.4314,2942.0881,105.29993, 100, 0, 0),
+(@CGUID+174, 13, 2726.0432,2979.8147,118.342224, 100, 0, 0),
+(@CGUID+174, 14, 2698.9668,3008.6619,115.70425, 100, 0, 0),
+(@CGUID+174, 15, 2667.4175,3020.1921,110.109955, 100, 0, 0),
+(@CGUID+174, 16, 2656.264,3041.5986,119.55517, 100, 0, 0),
+-- Nether Ray
+(@CGUID+175, 1, 2860.7996,3100.6145,136.4275, 100, 0, 0),
+(@CGUID+175, 2, 2833.879,3067.322,130.21774, 100, 0, 0),
+(@CGUID+175, 3, 2803.0862,3033.0793,128.55972, 100, 0, 0),
+(@CGUID+175, 4, 2769.2092,2999.7883,120.53973, 100, 0, 0),
+(@CGUID+175, 5, 2752.8748,2967.3013,116.27324, 100, 0, 0),
+(@CGUID+175, 6, 2750.5312,2935.3945,114.50632, 100, 0, 0),
+(@CGUID+175, 7, 2742.301,2902.0083,109.40503, 100, 0, 0),
+-- Nether Ray
+(@CGUID+176, 1, 2826.3145,3047.5208,129.28552, 100, 0, 0),
+(@CGUID+176, 2, 2827.6619,3066.208,130.48979, 100, 0, 0),
+(@CGUID+176, 3, 2848.0747,3093.4436,132.62427, 100, 0, 0),
+(@CGUID+176, 4, 2871.1716,3100.596,135.82417, 100, 0, 0),
+(@CGUID+176, 5, 2892.2021,3086.4983,130.05669, 100, 0, 0),
+(@CGUID+176, 6, 2916.7695,3078.3801,117.69228, 100, 0, 0),
+(@CGUID+176, 7, 2931.3677,3085.4097,124.65414, 100, 0, 0),
+(@CGUID+176, 8, 2913.3286,3108.0872,136.92761, 100, 0, 0),
+(@CGUID+176, 9, 2888.1165,3103.5735,134.77417, 100, 0, 0),
+(@CGUID+176, 10, 2874.5837,3076.8647,130.39465, 100, 0, 0),
+(@CGUID+176, 11, 2864.6567,3041.682,126.308655, 100, 0, 0),
+(@CGUID+176, 12, 2843.429,3035.9646,122.93391, 100, 0, 0),
+-- Nether Ray
+(@CGUID+177, 1, 2830.5066,3010.0386,122.993576, 100, 0, 0),
+(@CGUID+177, 2, 2814.2822,3024.9375,124.871445, 100, 0, 0),
+(@CGUID+177, 3, 2815.7803,3023.5742,123.664215, 100, 0, 0),
+(@CGUID+177, 4, 2793.697,3003.9438,124.46347, 100, 0, 0),
+(@CGUID+177, 5, 2772.3438,2989.0898,119.71761, 100, 0, 0),
+(@CGUID+177, 6, 2748.8762,2991.9883,115.870476, 100, 0, 0),
+(@CGUID+177, 7, 2748.5864,3009.797,120.41502, 100, 0, 0),
+(@CGUID+177, 8, 2767.257,3018.9854,122.827805, 100, 0, 0),
+(@CGUID+177, 9, 2801.0518,3000.4434,124.587296, 100, 0, 0),
+(@CGUID+177, 10, 2812.8242,2982.8274,116.203354, 100, 0, 0),
+(@CGUID+177, 11, 2832.336,2996.5461,120.59824, 100, 0, 0),
+-- Nether Ray
+(@CGUID+178, 1, 2770.9194,2922.7954,119.628075, 100, 0, 0),
+(@CGUID+178, 2, 2783.7737,2906.5742,115.39661, 100, 0, 0),
+(@CGUID+178, 3, 2803.7415,2897.0457,105.09941, 100, 0, 0),
+(@CGUID+178, 4, 2822.364,2918.7068,112.12544, 100, 0, 0),
+(@CGUID+178, 5, 2825.2053,2950.8203,116.82763, 100, 0, 0),
+(@CGUID+178, 6, 2837.3584,2982.1287,118.682144, 100, 0, 0),
+(@CGUID+178, 7, 2836.9204,3013.6245,122.42209, 100, 0, 0),
+(@CGUID+178, 8, 2845.6934,3043.203,125.29798, 100, 0, 0),
+(@CGUID+178, 9, 2844.3086,3038.5586,122.69491, 100, 0, 0),
+(@CGUID+178, 10, 2802.0742,3034.9495,128.48584, 100, 0, 0),
+(@CGUID+178, 11, 2782.4163,3015.4128,124.558876, 100, 0, 0),
+(@CGUID+178, 12, 2763.2998,2993.6064,118.66934, 100, 0, 0),
+(@CGUID+178, 13, 2758.5195,2957.2532,118.17726, 100, 0, 0),
+-- Nether Ray
+(@CGUID+179, 1, 2760.5798,2914.2092,115.68042, 100, 0, 0),
+(@CGUID+179, 2, 2779.291,2907.1387,115.10535, 100, 0, 0),
+(@CGUID+179, 3, 2807.436,2930.3215,120.19253, 100, 0, 0),
+(@CGUID+179, 4, 2814.2996,2948.5908,117.09852, 100, 0, 0),
+(@CGUID+179, 5, 2831.9346,2931.5574,112.46862, 100, 0, 0),
+(@CGUID+179, 6, 2811.0012,2909.626,110.038086, 100, 0, 0),
+(@CGUID+179, 7, 2787.9663,2937.5347,118.392395, 100, 0, 0),
+(@CGUID+179, 8, 2762.5066,2939.073,117.6239, 100, 0, 0);
 
 DELETE FROM `creature_movement_template` WHERE `entry` IN (19569);
 INSERT INTO `creature_movement_template` (`entry`, `pathId`, `point`, `PositionX`, `PositionY`, `PositionZ`, `orientation`, `WaitTime`, `ScriptId`) VALUES
@@ -465,7 +693,6 @@ INSERT INTO `creature_movement_template` (`entry`, `pathId`, `point`, `PositionX
 (19569, 0, 20, 3381.026,4289.326,120.66898, 100, 0, 0),
 (19569, 0, 21, 3384.844,4272.874,122.67322, 100, 0, 0),
 (19569, 0, 22, 3389.8567,4267.7715,122.70082,100, 0, 0);
-
 -- SpawnData
 DELETE FROM creature_spawn_data WHERE guid IN (70008, 71807, 71808, 71809, 71810, 71811, 71812, 71813, 71814, 71815, 71816, 71817, 71818, 71819);
 DELETE FROM creature_spawn_data WHERE guid BETWEEN @CGUID+1 AND @CGUID+95;
@@ -498,6 +725,19 @@ INSERT INTO `creature_spawn_data` (`guid`, `id`) VALUES
 (@CGUID+33, 1887901),
 (@CGUID+34, 1887901),
 (@CGUID+35, 1887901),
+(@CGUID+121, 1887901),
+(@CGUID+122, 1887901),
+(@CGUID+123, 1887901),
+(@CGUID+163, 1887901),
+(@CGUID+164, 1887901),
+(@CGUID+165, 1887901),
+(@CGUID+166, 1887901),
+(@CGUID+167, 1887901),
+(@CGUID+168, 1887901),
+(@CGUID+169, 1887901),
+(@CGUID+170, 1887901),
+(@CGUID+171, 1887901),
+(@CGUID+172, 1887901),
 -- Generic RunOn
 (@CGUID+95, 1);
 
@@ -564,6 +804,14 @@ INSERT INTO `spawn_group` (`Id`, `Name`, `Type`, `MaxCount`, `WorldState`, `Flag
 (@SGGUID+9, 'Netherstorm - Group 009 - Mana Wraith ()', 0, 0, 0, 0, 0),
 -- Sundered Rumbler
 (@SGGUID+10, 'Netherstorm - Group 010 - Sundered Rumbler', 0, 0, 0, 0, 0),
+-- Farahlon Giant 
+(@SGGUID+11, 'Netherstorm - Group 011 - Farahlon Giant (6)', 0, 0, 0, 0, 0),
+-- Artifact Seeker
+(@SGGUID+12, 'Netherstorm - Group 012 - Artifact Seeker (13)', 0, 0, 0, 0, 0),
+-- Felblade Doomguard
+(@SGGUID+13, 'Netherstorm - Group 013 - Felblade Doomguard (7)', 0, 0, 0, 0, 0),
+-- Pentatharon
+(@SGGUID+14, 'Netherstorm - Group 014 - Pentatharon (1)', 0, 1, 0, 0, 0),
 -- Grouping for Etherlithium Matrix Crystal - 29 spawns, max spawned 21
 (@SGGUID+100, 'Netherstorm - Etherlithium Matrix Crystal', 1, 21, 0, 0, 0);
 
@@ -592,11 +840,28 @@ INSERT INTO `spawn_group_spawn` (`Id`, `Guid`, `SlotId`, `Chance`) VALUES
 (@SGGUID+1, @CGUID+121, -1, 0), -- Phase Hunter
 (@SGGUID+1, @CGUID+122, -1, 0), -- Phase Hunter
 (@SGGUID+1, @CGUID+123, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+163, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+164, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+165, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+166, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+167, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+168, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+169, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+170, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+171, -1, 0), -- Phase Hunter
+(@SGGUID+1, @CGUID+172, -1, 0), -- Phase Hunter
 -- Nether Ray
 (@SGGUID+2, @CGUID+17, -1, 0), -- Nether Ray
 (@SGGUID+2, @CGUID+30, -1, 0), -- Nether Ray
 (@SGGUID+2, @CGUID+128, -1, 0), -- Nether Ray
 (@SGGUID+2, @CGUID+129, -1, 0), -- Nether Ray
+(@SGGUID+2, @CGUID+173, -1, 0), -- Nether Ray
+(@SGGUID+2, @CGUID+174, -1, 0), -- Nether Ray
+(@SGGUID+2, @CGUID+175, -1, 0), -- Nether Ray
+(@SGGUID+2, @CGUID+176, -1, 0), -- Nether Ray
+(@SGGUID+2, @CGUID+177, -1, 0), -- Nether Ray
+(@SGGUID+2, @CGUID+178, -1, 0), -- Nether Ray
+(@SGGUID+2, @CGUID+179, -1, 0), -- Nether Ray
 -- Mana Snapper
 (@SGGUID+3, @CGUID+18, -1, 0), -- Mana Snapper
 -- Sgakeskin Flayer
@@ -613,6 +878,12 @@ INSERT INTO `spawn_group_spawn` (`Id`, `Guid`, `SlotId`, `Chance`) VALUES
 (@SGGUID+4, @CGUID+118, -1, 0), -- Shaleskin Flayer
 (@SGGUID+4, @CGUID+119, -1, 0), -- Shaleskin Flayer
 (@SGGUID+4, @CGUID+120, -1, 0), -- Shaleskin Flayer
+
+(@SGGUID+4, @CGUID+130, -1, 0), -- Shaleskin Flayer
+(@SGGUID+4, @CGUID+131, -1, 0), -- Shaleskin Flayer
+(@SGGUID+4, @CGUID+132, -1, 0), -- Shaleskin Flayer
+(@SGGUID+4, @CGUID+133, -1, 0), -- Shaleskin Flayer
+(@SGGUID+4, @CGUID+162, -1, 0), -- Shaleskin Flayer
 -- Static Disembodied Protector spawns
 (@SGGUID+5, @CGUID+36, -1, 0), -- Disembodied Protector
 (@SGGUID+5, @CGUID+39, -1, 0), -- Disembodied Protector
@@ -696,6 +967,38 @@ INSERT INTO `spawn_group_spawn` (`Id`, `Guid`, `SlotId`, `Chance`) VALUES
 (@SGGUID+10, @CGUID+125, -1, 0), -- Sundered Rumbler
 (@SGGUID+10, @CGUID+126, -1, 0), -- Sundered Rumbler
 (@SGGUID+10, @CGUID+127, -1, 0), -- Sundered Rumbler
+-- Farahlon Giant
+(@SGGUID+11, @CGUID+134, -1, 0), -- Farahlon Giant
+(@SGGUID+11, @CGUID+135, -1, 0), -- Farahlon Giant
+(@SGGUID+11, @CGUID+136, -1, 0), -- Farahlon Giant
+(@SGGUID+11, @CGUID+137, -1, 0), -- Farahlon Giant
+(@SGGUID+11, @CGUID+138, -1, 0), -- Farahlon Giant
+(@SGGUID+11, @CGUID+139, -1, 0), -- Farahlon Giant
+-- Artifact Seeker
+(@SGGUID+12, @CGUID+140, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+141, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+142, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+143, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+144, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+145, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+146, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+147, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+148, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+149, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+150, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+151, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+152, -1, 0), -- Artifact Seeker
+(@SGGUID+12, @CGUID+153, -1, 0), -- Artifact Seeker
+-- Felblade Doomguard
+(@SGGUID+13, @CGUID+154, -1, 0), -- Felblade Doomguard
+(@SGGUID+13, @CGUID+155, -1, 0), -- Felblade Doomguard
+(@SGGUID+13, @CGUID+156, -1, 0), -- Felblade Doomguard
+(@SGGUID+13, @CGUID+157, -1, 0), -- Felblade Doomguard
+(@SGGUID+13, @CGUID+158, -1, 0), -- Felblade Doomguard
+(@SGGUID+13, @CGUID+159, -1, 0), -- Felblade Doomguard
+(@SGGUID+13, @CGUID+160, -1, 0), -- Felblade Doomguard
+-- Pentatharon
+(@SGGUID+14, @CGUID+161, -1, 0), -- Pentatharon
 -- Etherlithium Matrix Crystal 
 (@SGGUID+100, @GGUID+1, -1, 0), -- Etherlithium Matrix Crystal
 (@SGGUID+100, @GGUID+2, -1, 0), -- Etherlithium Matrix Crystal
diff --git a/Updates/0529_netherstorm_AIs.sql b/Updates/0529_netherstorm_AIs.sql
index 487f013ef..0d0a23cb7 100644
--- a/Updates/0529_netherstorm_AIs.sql
+++ b/Updates/0529_netherstorm_AIs.sql
@@ -73,4 +73,53 @@ DELETE FROM `creature_spell_list` WHERE `Id` IN (2105801);
 INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
 (2105801, 1, 33910, 0, -1, 204, 0, 100, 0, 2000, 10000, 2000, 10000, 'Disembodied Exarch - Heal Other - friendly missing 50% excluding self');
 
-UPDATE `creature_template` SET `SpellList` = 2105801 WHERE `entry` = 21058;
\ No newline at end of file
+UPDATE `creature_template` SET `SpellList` = 2105801 WHERE `entry` = 21058;
+
+
+-- Felblade Doomguard
+DELETE FROM `creature_template_spells` WHERE `entry` = 19853;
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id`= 1985301;
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(1985301, 'Netherstorm - Felblade Doomguard', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1985301);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(1985301, 1, 35238, 0, -1, 1, 0, 100, 0, 8000, 16000, 12000, 24000, 'Felblade Doomguard - War Stomp - current'),
+(1985301, 2, 32736, 0, -1, 1, 0, 100, 0, 9000, 20000, 16000, 27000, 'Felblade Doomguard - Mortal Strike - current');
+
+UPDATE `creature_template` SET `SpellList` = 1985301 WHERE `entry` = 19853;
+
+-- Artifact Seeker
+DELETE FROM `creature_template_spells` WHERE `entry` = 19852;
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id`= 1985201;
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(1985201, 'Netherstorm - Artifact Seeker', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1985201);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(1985201, 1, 30849, 0, -1, 134, 0, 100, 0, 1000, 15000, 10000, 25000, 'Artifact Seeker - Spell Lock - top aggro casting'),
+(1985201, 2, 11981, 0, -1, 133, 0, 100, 0, 6000, 16000, 14000, 24000, 'Artifact Seeker - Mana Burn - top aggro mana user');
+
+UPDATE `creature_template` SET `SpellList` = 1985201 WHERE `entry` = 19852;
+
+DELETE FROM creature_spell_targeting WHERE Id IN (133,134);
+INSERT INTO `creature_spell_targeting` (`Id`, `Type`, `Param1`, `Param2`, `Param3`, `Comments`) VALUES 
+(133, 1, 1, 0, 4, 'Attack - top aggro mana user'),
+(134, 1, 1, 0, 32768, 'Attack - top aggro casting');
+
+-- Pentatharon
+DELETE FROM `creature_template_spells` WHERE `entry` = 20215;
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id`= 2021501;
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(2021501, 'Netherstorm - Pentatharon', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (2021501);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(2021501, 1, 20663, 0, -1, 101, 0, 100, 0, 1000, 15000, 10000, 25000, 'Pentatharon - Sleep - random player non tank'),
+(2021501, 2, 36039, 0, -1, 1, 0, 100, 0, 6000, 16000, 14000, 24000, 'Pentatharon - Carrion Swarm - current');
+
+UPDATE `creature_template` SET `SpellList` = 2021501 WHERE `entry` = 20215;
+