diff --git a/ACID/acid_classic.sql b/ACID/acid_classic.sql
index 694dbd233..e3086c4ee 100644
--- a/ACID/acid_classic.sql
+++ b/ACID/acid_classic.sql
@@ -15201,7 +15201,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Theradrim Shardling
 ('1178301','11783','9','0','100','1025','0','5','7000','11000','0','0','11','13584','1','0','0','0','0','0','0','0','0','0','Theradrim Shardling - Cast Strike'),
 -- Theradrim Guardian
-('1178401','11784','11','0','100','0','0','0','0','0','0','0','11','21057','0','1','0','0','0','0','0','0','0','0','Theradrim Guardian - Summon Theradrim Shardling on Spawn'),
+('1178401','11784','11','0','100','0','0','0','0','0','0','0','11','21057','0','0','0','0','0','0','0','0','0','0','Theradrim Guardian - Cast Summon Theradrim Shardling on Spawn'),
 ('1178402','11784','9','0','100','1025','0','5','7000','12000','0','0','11','16790','1','0','0','0','0','0','0','0','0','0','Theradrim Guardian - Cast Knockdown'),
 -- Ambereye Basilisk
 ('1178501','11785','9','0','100','1025','0','5','15000','21000','0','0','11','11020','4','0','0','0','0','0','0','0','0','0','Ambereye Basilisk - Cast Petrify'),
@@ -15222,14 +15222,11 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1179201','11792','1','0','100','1','1000','1000','5000','5000','0','0','11','21061','0','34','11','7939','0','34','11','22766','0','34','Putridus Shadowstalker - Cast Putrid Breath, Sneak OOC'),
 ('1179202','11792','0','0','100','1025','4000','12000','12000','24000','0','0','11','9080','1','0','0','0','0','0','0','0','0','0','Putridus Shadowstalker - Cast Hamstring'),
 ('1179203','11792','0','0','100','1025','8000','24000','21000','30000','0','0','11','15087','0','0','0','0','0','0','0','0','0','0','Putridus Shadowstalker - Cast Evasion'),
--- Celebrian Dryad 11793
-('1179301','11793','4','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Celebrian Dryad - Enable Range Mode on Aggro'),
-('1179302','11793','0','0','100','1025','8000','16000','12000','16000','0','0','11','17201','0','0','0','0','0','0','0','0','0','0','Celebrian Dryad - Cast Dispel Magic'),
-('1179303','11793','9','0','100','1025','5','30','2300','3900','0','0','11','16000','1','256','0','0','0','0','0','0','0','0','Celebrian Dryad - Cast Throw'),
--- Sister of Celebrian 11794 - Distance on Immobile
-('1179401','11794','4','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Sister of Celebras - Enable Range Mode on Aggro'),
-('1179402','11794','9','0','100','1025','0','5','5000','9000','0','0','11','17201','1','0','0','0','0','0','0','0','0','0','Sister of Celebras - Cast Strike'),
-('1179403','11794','9','0','100','1025','5','30','2300','3900','0','0','11','15795','1','256','0','0','0','0','0','0','0','0','Sister of Celebras - Cast Throw'),
+-- Celebrian Dryad 11793 - creature_spell_list
+('1179301','11793','11','0','100','0','0','0','0','0','0','0','57','4','25','0','11','8601','0','34','0','0','0','0','Celebrian Dryad - Enable TYPE_DISTANCER, Slowing Poison on Spawn'),
+('1179302','11793','4','0','20','0','0','0','0','0','0','0','1','8639','8640','0','0','0','0','0','0','0','0','0','Celebrian Dryad - Say on Aggro'),
+-- Sister of Celebrian 11794 - creature_spell_list
+('1179401','11794','11','0','100','0','0','0','0','0','0','0','57','4','25','0','0','0','0','0','0','0','0','0','Sister of Celebras - Enable TYPE_DISTANCER on Spawn'),
 -- Princess Theradras 12201 - s.3391 manually casted
 ('1220101','12201','6','0','100','0','0','0','0','0','0','0','32','12238','0','21','0','0','0','0','0','0','0','0','Princess Theradras - Summon Zaetar''s Spirit 12238 on Death'),
 ('1220102','12201','0','0','100','1025','8000','13000','20000','25000','0','0','11','21909','15','0','0','0','0','0','0','0','0','0','Princess Theradras - Cast Dust Field'),
@@ -15278,7 +15275,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1222504','12225','0','0','100','1025','50000','60000','50000','60000','0','0','11','21793','0','0','0','0','0','0','0','0','0','0','Celebras the Cursed - Cast Twisted Tranquility'),
 ('1222505','12225','6','0','100','0','0','0','0','0','0','0','32','13716','0','7','0','0','0','0','0','0','0','0','Celebras the Cursed - Summon Celebras the Redeemed 13716 on Death'),
 -- Lord Vyletongue 12236
-('1223601','12236','4','0','100','0','0','0','0','0','0','0','57','2','25','0','11','674','0','0','0','0','0','0','Lord Vyletongue - Enable Range Mode and Cast Dual Wield on Aggro'),
+('1223601','12236','11','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Lord Vyletongue - Enable Range Mode on Spawn'),
 ('1223602','12236','0','0','100','1025','20000','30000','20000','30000','0','0','11','21655','0','0','0','0','0','0','0','0','0','0','Lord Vyletongue - Cast Blink'),
 ('1223603','12236','0','0','100','1025','8000','12000','14000','18000','0','0','11','7964','0','0','0','0','0','0','0','0','0','0','Lord Vyletongue - Cast Smoke Bomb'),
 ('1223604','12236','9','0','100','1025','5','30','7000','9500','0','0','11','21390','1','0','0','0','0','0','0','0','0','0','Lord Vyletongue - Cast Multi-Shot'),
@@ -15303,7 +15300,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1224104','12241','28','3','100','1','15572','1','5000','5000','0','0','22','1','0','0','0','0','0','0','0','0','0','0','Spirit of Magra - Set Phase 1 on Target Missing Sunder Armor Aura Stack (Phase 2)'),
 ('1224105','12241','0','0','100','1025','2000','5000','18000','26000','0','0','11','9128','0','0','0','0','0','0','0','0','0','0','Spirit of Magra - Cast Battle Shout'),
 ('1224106','12241','8','0','100','1','21960','-1','0','0','0','0','36','13740','0','0','0','0','0','0','0','0','0','0','Spirit of Magra - Template Change to Magra on Manifest Spirit Spell Hit'),
-('1224107','12241','7','0','100','0','0','0','0','0','0','0','22','0','0','0','0','0','0','0','0','0','0','0','Spirit of Magra - Set Phase to 0 on Evade'),
+('1224107','12241','7','0','100','0','0','0','0','0','0','0','22','0','0','0','0','0','0','0','0','0','0','0','Spirit of Magra - Set Phase 0 on Evade'),
 -- Spirit of Maraudos 12242
 ('1224201','12242','8','0','100','0','21960','-1','0','0','0','0','36','13739','0','0','0','0','0','0','0','0','0','0','Spirit of Maraudos - Template Change to Maraudos on Manifest Spirit Spell Hit'),
 ('1224202','12242','4','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Spirit of Maraudos - Enable Range Mode on Aggro'),
diff --git a/Updates/4707_MC_Random.sql b/Updates/4707_MC_Random.sql
index 76686c178..bc1ba9a69 100644
--- a/Updates/4707_MC_Random.sql
+++ b/Updates/4707_MC_Random.sql
@@ -30,9 +30,11 @@ UPDATE `creature_template` SET `CharmedSpellList`='1179205', `MechanicImmuneMask
 UPDATE `creature_template` SET `CharmedSpellList`='1179005', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='11790'; -- https://www.wowhead.com/classic/npc=11790/putridus-satyr
 UPDATE `creature_template` SET `CharmedSpellList`='1221605', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='12216'; -- https://www.wowhead.com/classic/npc=12216/poison-sprite
 UPDATE `creature_template` SET `CharmedSpellList`='1221705', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='12217'; -- https://www.wowhead.com/classic/npc=12217/corruptor
+UPDATE `creature_template` SET `SpellList` = 1179401, `CharmedSpellList`='1179405', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='11794'; -- https://www.wowhead.com/classic/npc=11794/sister-of-celebrian
+UPDATE `creature_template` SET `SpellList` = 1179301, `CharmedSpellList`='1179305', `MechanicImmuneMask` = `MechanicImmuneMask`&~1 WHERE `entry`='11793'; -- https://www.wowhead.com/classic/npc=11793/celebrian-dryad
 
 DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (289205,673305,484405,484605,484505,293205,485105,485605,620005,620105,620205,977605,977705,977805,977905,1026305,1438905,1438605,1145305,1327605,
-1145705,1145605,1145205,1145105,1145405,1145505,1179105,1179205,1179005,1221605,1221705);
+1145705,1145605,1145205,1145105,1145405,1145505,1179105,1179205,1179005,1221605,1221705,1179405,1179305,1179401,1179301);
 INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
 (289205, 'Vanilla - Stonevault Seer', 0, 0),
 (673305, 'Vanilla - Stonevault Basher', 0, 0),
@@ -64,10 +66,14 @@ INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `C
 (1179205, 'Vanilla - Putridus Shadowstalker', 0, 0),
 (1179005, 'Vanilla - Putridus Satyr', 0, 0),
 (1221605, 'Vanilla - Poison Sprite', 0, 0),
-(1221705, 'Vanilla - Corruptor', 0, 0);
+(1221705, 'Vanilla - Corruptor', 0, 0),
+(1179405, 'Vanilla - Sister of Celebrian', 0, 0),
+(1179305, 'Vanilla - Celebrian Dryad', 0, 0),
+(1179401, 'Maraudon - Sister of Celebrian', 0, 75),
+(1179301, 'Maraudon - Celebrian Dryad', 50, 75);
 
 DELETE FROM `creature_spell_list` WHERE `Id` IN (289205,673305,484405,484605,484505,293205,485105,485605,620005,620105,620205,977605,977705,977805,977905,1026305,1438905,1438605,1145305,1327605,
-1145705,1145605,1145205,1145105,1145405,1145505,1179105,1179205,1179005,1221605,1221705);
+1145705,1145605,1145205,1145105,1145405,1145505,1179105,1179205,1179005,1221605,1221705,1179405,1179305,1179401,1179301);
 INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
 -- CharmedSpellList
 (289205, 4, 11986, 0, -1, 0, 0, 100, 1, 0, 0, 20000, 20000, 'Stonevault Seer - Healing Wave'),
@@ -152,7 +158,21 @@ INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `Combat
 (1221605, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Poison Sprite - Attack'),
 (1221705, 4, 21068, 0, -1, 0, 0, 100, 1, 0, 0, 5599, 7650, 'Corruptor - Corruption'),
 (1221705, 3, 5413, 0, -1, 0, 0, 100, 1, 0, 0, 5863, 7234, 'Corruptor - Noxious Catalyst'),
-(1221705, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Corruptor - Attack');
+(1221705, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Corruptor - Attack'),
+(1179405, 4, 14516, 0, -1, 0, 0, 100, 1, 0, 0, 3500, 5763, 'Sister of Celebrian - Strike'),
+(1179405, 3, 15795, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Sister of Celebrian - Throw'),
+(1179405, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Sister of Celebrian - Attack'),
+(1179305, 5, 17201, 0, -1, 0, 0, 100, 1, 0, 0, 6008, 7822, 'Celebrian Dryad - Dispel Magic'),
+(1179305, 3, 16000, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Celebrian Dryad - Throw'),
+(1179305, 0, 2, 0, -1, 0, 0, 100, 1, 0, 0, 0, 0, 'Celebrian Dryad - Attack'),
+-- ('1179402','11794','9','0','100','1025','0','5','5000','9000','0','0','11','14516','1','0','0','0','0','0','0','0','0','0','Sister of Celebras - Cast Strike'),
+-- ('1179403','11794','9','0','100','1025','5','30','2300','3900','0','0','11','15795','1','256','0','0','0','0','0','0','0','0','Sister of Celebras - Cast Throw'),
+(1179401, 4, 14516, 0, -1, 1, 0, 100, 1, 3000, 15000, 6000, 18000, 'Sister of Celebrian - Strike'),
+(1179401, 3, 15795, 2, -1, 1, 0, 100, 1, 0, 0, 2000, 4000, 'Sister of Celebrian - Throw'),
+-- ('1179302','11793','0','0','100','1025','8000','16000','12000','16000','0','0','11','17201','0','0','0','0','0','0','0','0','0','0','Celebrian Dryad - Cast Dispel Magic'),
+-- ('1179303','11793','9','0','100','1025','5','30','2300','3900','0','0','11','16000','1','256','0','0','0','0','0','0','0','0','Celebrian Dryad - Cast Throw'),
+(1179301, 5, 17201, 0, -1, 3, 0, 100, 1, 5000, 15000, 5000, 15000, 'Celebrian Dryad - Dispel Magic - eligible friendly dispel'),
+(1179301, 3, 16000, 2, -1, 1, 0, 100, 1, 0, 0, 2000, 4000, 'Celebrian Dryad - Throw');
 
 UPDATE `creature_spell_list` SET `RepeatMin`=6000 WHERE `Id`=1438901 AND `Position`=0; -- Dire Maul - Netherwalker - Shadow Bolt Volley on Current