diff --git a/data/sql/updates/db_world/2023_02_10_00.sql b/data/sql/updates/db_world/2023_02_10_00.sql
new file mode 100644
index 000000000..fcad57312
--- /dev/null
+++ b/data/sql/updates/db_world/2023_02_10_00.sql
@@ -0,0 +1,10 @@
+-- DB update 2023_02_09_00 -> 2023_02_10_00
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (35008);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 35008 AND `id` IN (0,1,2,3); -- Sawemba
+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`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(35008, 0, 0, 0, 23, 0, 100, 0, 12544, 0, 3000, 3000, 0, 11, 12544, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Sawemba - On missing aura - Cast \'Frost Armor\''),
+(35008, 0, 1, 0, 0, 0, 100, 0, 1000, 2000, 3000, 4000, 0, 11, 20692, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Sawemba - IC - Cast Fireball'),
+(35008, 0, 2, 0, 0, 0, 100, 0, 4000, 6000, 6000, 8000, 0, 11, 38534, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Sawemba - IC - Cast Frostbolt'),
+(35008, 0, 3, 0, 0, 0, 100, 0, 8000, 12000, 15000, 20000, 0, 11, 38896, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Sawemba - IC - Cast Polymorph');
diff --git a/data/sql/updates/db_world/2023_02_10_01.sql b/data/sql/updates/db_world/2023_02_10_01.sql
new file mode 100644
index 000000000..99b873fff
--- /dev/null
+++ b/data/sql/updates/db_world/2023_02_10_01.sql
@@ -0,0 +1,6 @@
+-- DB update 2023_02_10_00 -> 2023_02_10_01
+--
+
+UPDATE `smart_scripts` SET `target_type`=21, `target_param1`=30 WHERE `entryorguid` IN (2832700) AND `source_type`=9 AND `id` IN (0,1,2);
+UPDATE `smart_scripts` SET `action_type`=69, `target_type`=8, `target_x`=5355.424805, `target_y`=4486.478027, `target_z`=-120.716667 WHERE `entryorguid` IN (2832700) AND `source_type`=9 AND `id` IN (4);
+UPDATE `smart_scripts` SET `action_param4`=1 WHERE `entryorguid` IN (28327) AND `source_type`=0 AND `id` IN (1);
diff --git a/data/sql/updates/db_world/2023_02_10_02.sql b/data/sql/updates/db_world/2023_02_10_02.sql
new file mode 100644
index 000000000..ae576fa8f
--- /dev/null
+++ b/data/sql/updates/db_world/2023_02_10_02.sql
@@ -0,0 +1,96 @@
+-- DB update 2023_02_10_01 -> 2023_02_10_02
+--
+
+UPDATE `creature` SET `id1`=40607 WHERE `guid`=133917 AND `id1` = 34084;
+DELETE FROM `npc_vendor` WHERE `entry`=40607;
+INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`, `VerifiedBuild`) VALUES
+(40607, 0, 40787, 0, 0, 2959, 0),
+(40607, 0, 40788, 0, 0, 2959, 0),
+(40607, 0, 40789, 0, 0, 2959, 0),
+(40607, 0, 40807, 0, 0, 2960, 0),
+(40607, 0, 40808, 0, 0, 2960, 0),
+(40607, 0, 40809, 0, 0, 2960, 0),
+(40607, 0, 40826, 0, 0, 2959, 0),
+(40607, 0, 40827, 0, 0, 2959, 0),
+(40607, 0, 40828, 0, 0, 2959, 0),
+(40607, 0, 40847, 0, 0, 2958, 0),
+(40607, 0, 40848, 0, 0, 2958, 0),
+(40607, 0, 40849, 0, 0, 2958, 0),
+(40607, 0, 40866, 0, 0, 2958, 0),
+(40607, 0, 40868, 0, 0, 2958, 0),
+(40607, 0, 40869, 0, 0, 2958, 0),
+(40607, 0, 40907, 0, 0, 2959, 0),
+(40607, 0, 40927, 0, 0, 2960, 0),
+(40607, 0, 40933, 0, 0, 2959, 0),
+(40607, 0, 40939, 0, 0, 2958, 0),
+(40607, 0, 40963, 0, 0, 2958, 0),
+(40607, 0, 40992, 0, 0, 2959, 0),
+(40607, 0, 40993, 0, 0, 2959, 0),
+(40607, 0, 41001, 0, 0, 2960, 0),
+(40607, 0, 41007, 0, 0, 2960, 0),
+(40607, 0, 41013, 0, 0, 2959, 0),
+(40607, 0, 41019, 0, 0, 2959, 0),
+(40607, 0, 41027, 0, 0, 2958, 0),
+(40607, 0, 41033, 0, 0, 2958, 0),
+(40607, 0, 41038, 0, 0, 2958, 0),
+(40607, 0, 41044, 0, 0, 2958, 0),
+(40607, 0, 41081, 0, 0, 2959, 0),
+(40607, 0, 41087, 0, 0, 2959, 0),
+(40607, 0, 41137, 0, 0, 2960, 0),
+(40607, 0, 41143, 0, 0, 2960, 0),
+(40607, 0, 41151, 0, 0, 2959, 0),
+(40607, 0, 41157, 0, 0, 2959, 0),
+(40607, 0, 41199, 0, 0, 2958, 0),
+(40607, 0, 41205, 0, 0, 2958, 0),
+(40607, 0, 41211, 0, 0, 2958, 0),
+(40607, 0, 41217, 0, 0, 2958, 0),
+(40607, 0, 41275, 0, 0, 2958, 0),
+(40607, 0, 41281, 0, 0, 2958, 0),
+(40607, 0, 41287, 0, 0, 2960, 0),
+(40607, 0, 41293, 0, 0, 2960, 0),
+(40607, 0, 41298, 0, 0, 2958, 0),
+(40607, 0, 41304, 0, 0, 2958, 0),
+(40607, 0, 41310, 0, 0, 2959, 0),
+(40607, 0, 41316, 0, 0, 2959, 0),
+(40607, 0, 41321, 0, 0, 2959, 0),
+(40607, 0, 41327, 0, 0, 2959, 0),
+(40607, 0, 41650, 0, 0, 2959, 0),
+(40607, 0, 41655, 0, 0, 2958, 0),
+(40607, 0, 41661, 0, 0, 2959, 0),
+(40607, 0, 41667, 0, 0, 2958, 0),
+(40607, 0, 41672, 0, 0, 2959, 0),
+(40607, 0, 41678, 0, 0, 2959, 0),
+(40607, 0, 41683, 0, 0, 2958, 0),
+(40607, 0, 41715, 0, 0, 2958, 0),
+(40607, 0, 41767, 0, 0, 2960, 0),
+(40607, 0, 41773, 0, 0, 2960, 0),
+(40607, 0, 41854, 0, 0, 2959, 0),
+(40607, 0, 41859, 0, 0, 2959, 0),
+(40607, 0, 41864, 0, 0, 2958, 0),
+(40607, 0, 41869, 0, 0, 2958, 0),
+(40607, 0, 41874, 0, 0, 2960, 0),
+(40607, 0, 41915, 0, 0, 2959, 0),
+(40607, 0, 41921, 0, 0, 2959, 0),
+(40607, 0, 41927, 0, 0, 2958, 0),
+(40607, 0, 41934, 0, 0, 2958, 0),
+(40607, 0, 41940, 0, 0, 2960, 0),
+(40607, 0, 41946, 0, 0, 2959, 0),
+(40607, 0, 41953, 0, 0, 2959, 0),
+(40607, 0, 41959, 0, 0, 2958, 0),
+(40607, 0, 41965, 0, 0, 2958, 0),
+(40607, 0, 41971, 0, 0, 2960, 0),
+(40607, 0, 41993, 0, 0, 2959, 0),
+(40607, 0, 41998, 0, 0, 2959, 0),
+(40607, 0, 42005, 0, 0, 2958, 0),
+(40607, 0, 42011, 0, 0, 2958, 0),
+(40607, 0, 42017, 0, 0, 2960, 0),
+(40607, 0, 42579, 0, 0, 2969, 0),
+(40607, 0, 42584, 0, 0, 2969, 0),
+(40607, 0, 42589, 0, 0, 2969, 0),
+(40607, 0, 42598, 0, 0, 2969, 0),
+(40607, 0, 42603, 0, 0, 2969, 0),
+(40607, 0, 42608, 0, 0, 2969, 0),
+(40607, 0, 42615, 0, 0, 2969, 0),
+(40607, 0, 42621, 0, 0, 2969, 0),
+(40607, 0, 42853, 0, 0, 2969, 0),
+(40607, 0, 45706, 0, 0, 2596, 0);
diff --git a/data/sql/updates/db_world/2023_02_10_03.sql b/data/sql/updates/db_world/2023_02_10_03.sql
new file mode 100644
index 000000000..93eaebf9e
--- /dev/null
+++ b/data/sql/updates/db_world/2023_02_10_03.sql
@@ -0,0 +1,10 @@
+-- DB update 2023_02_10_02 -> 2023_02_10_03
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (35602);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 35602 AND `id` IN (0,1,2,3); -- Magister Savarin
+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`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(35602, 0, 0, 0, 23, 0, 100, 0, 12544, 0, 3000, 3000, 0, 11, 12544, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Magister Savarin - On missing aura - Cast \'Frost Armor\''),
+(35602, 0, 1, 0, 0, 0, 100, 0, 1000, 2000, 3000, 4000, 0, 11, 20692, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Magister Savarin - IC - Cast Fireball'),
+(35602, 0, 2, 0, 0, 0, 100, 0, 4000, 6000, 6000, 8000, 0, 11, 38534, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Magister Savarin - IC - Cast Frostbolt'),
+(35602, 0, 3, 0, 0, 0, 100, 0, 8000, 12000, 15000, 20000, 0, 11, 38896, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Magister Savarin - IC - Cast Polymorph');
diff --git a/data/sql/updates/db_world/2023_02_10_04.sql b/data/sql/updates/db_world/2023_02_10_04.sql
new file mode 100644
index 000000000..db25fc5e9
--- /dev/null
+++ b/data/sql/updates/db_world/2023_02_10_04.sql
@@ -0,0 +1,8 @@
+-- DB update 2023_02_10_03 -> 2023_02_10_04
+--
+
+DELETE FROM `creature` WHERE `guid` IN (104173, 104174, 104175);
+INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`) VALUES 
+(104173, 18378, 571, 1, 1, 0, 2750.36, 6127.08, 208.856, 5.44543, 180, 0, 0, 4050, 0, 0),
+(104174, 18379, 571, 1, 1, 0, 2761.16, 6137.27, 208.872, 5.35816, 180, 0, 0, 4050, 0, 0),
+(104175, 18380, 571, 1, 1, 0, 2779.98, 6154.28, 208.92, 5.35816, 180, 0, 0, 4050, 0, 0);
diff --git a/data/sql/updates/db_world/2023_02_10_05.sql b/data/sql/updates/db_world/2023_02_10_05.sql
new file mode 100644
index 000000000..7d0f123e8
--- /dev/null
+++ b/data/sql/updates/db_world/2023_02_10_05.sql
@@ -0,0 +1,9 @@
+-- DB update 2023_02_10_04 -> 2023_02_10_05
+--
+DELETE FROM `creature` WHERE `guid` IN (106326)  AND `id1` IN (21365);
+INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES
+(106326, 21365, 530, 0, 0, 1, 1, 0, 38.3723, 2121.23, 128.975, 2.80337, 600, 0, 0, 42, 0, 0, 0, 0, 0, 0);
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (21365);
+INSERT INTO `creature_template_addon` (`entry`, `auras`) VALUES
+(21365, '36725 36727');
diff --git a/data/sql/updates/db_world/2023_02_10_06.sql b/data/sql/updates/db_world/2023_02_10_06.sql
new file mode 100644
index 000000000..a1ef13924
--- /dev/null
+++ b/data/sql/updates/db_world/2023_02_10_06.sql
@@ -0,0 +1,2 @@
+-- DB update 2023_02_10_05 -> 2023_02_10_06
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask` &~ 16384 WHERE `entry` IN (17848, 17862, 18096, 20521, 20531, 20535);
diff --git a/data/sql/updates/db_world/2023_02_10_07.sql b/data/sql/updates/db_world/2023_02_10_07.sql
new file mode 100644
index 000000000..4d789fc0a
--- /dev/null
+++ b/data/sql/updates/db_world/2023_02_10_07.sql
@@ -0,0 +1,18 @@
+-- DB update 2023_02_10_06 -> 2023_02_10_07
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (24029);
+
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 24029 AND `id` IN (0,1,2,3,4,5); -- Wyrmcaller Vile
+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`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+
+(24029, 0, 0, 0, 1, 0, 100, 513, 0, 0, 3000, 3000, 0, 11, 43576, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Wyrmcaller Vile - OOC - Cast \'Frost Power\''),
+(24029, 0, 1, 0, 0, 0, 100, 0, 0, 0, 4000, 4000, 0, 11, 9672, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Wyrmcaller Vile - IC - Cast \'Frostbolt\''),
+(24029, 0, 2, 0, 0, 0, 100, 0, 0, 0, 6000, 10000, 0, 11, 15532, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Wyrmcaller Vile - IC - Cast \'Frost Nova\''),
+(24029, 0, 3, 0, 1, 0, 100, 512, 0, 0, 3000, 3000, 0, 45, 0, 1, 0, 0, 0, 0, 19, 23033, 10, 0, 0, 0, 0, 0, 0, 'Wyrmcaller Vile - OOC - Cast \'Set Data\''),
+(24029, 0, 4, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Wyrmcaller Vile - On Aggro - Say Line 0'),
+(24029, 0, 5, 0, 23, 0, 100, 0, 12544, 0, 3000, 3000, 0, 11, 12544, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Wyrmcaller Vile - On missing aura - Cast Frost Armor');
+
+DELETE FROM `creature_text` WHERE `CreatureID`=24029 AND `GroupID`=0 AND `ID`=0;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES 
+(24029, 0, 0, 'Did you really think that by facing me, you have any hope of saving your friends?', 12, 0, 100, 0, 0, 0, 23696, 0, 'Wyrmcaller Vile');
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index 980d00719..97aadbe9c 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -834,7 +834,7 @@ public:
                         _actionEvents.ScheduleEvent(EVENT_KAYLAAN_RESSURECTION, 1000);
                         break;
                     case EVENT_KAYLAAN_RESSURECTION:
-                        if (GetCreature(KAYLAAN_THE_LOST))
+                        if (GetCreature(KAYLAAN_THE_LOST) && GetCreature(ISHANAH_HIGH_PRIESTESS))
                             kaylaan->CastSpell(ishanah, REDEMPTION);
                         _actionEvents.ScheduleEvent(EVENT_ISHANAH_IS_BACK_AGAIN, 11000);
                         break;