diff --git a/data/sql/world/base/dungeon_scarlet_monastery.sql b/data/sql/world/base/dungeon_scarlet_monastery.sql
index 9021dc9..16fc592 100644
--- a/data/sql/world/base/dungeon_scarlet_monastery.sql
+++ b/data/sql/world/base/dungeon_scarlet_monastery.sql
@@ -168,6 +168,9 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (4543, 0, 4, 0, 0, 0, 100, 0, 0, 8000, 8000, 16000, 0, 0, 11, 8814, 0, 0, 0, 0, 0, 5, 30, 0, 0, 0, 0, 0, 0, 0,       'Bloodmage Thalnos - Within 0-30 Range - Cast Flame Spike'),
 (4543, 0, 5, 0, 0, 0, 100, 0, 0, 16000, 16000, 60000, 0, 0, 11, 8053, 0, 0, 0, 0, 0, 5, 20, 0, 0, 0, 0, 0, 0, 0,     'Bloodmage Thalnos - Within 0-20 Range - Cast Flame Shock'),
 (4543, 0, 6, 0, 106, 0, 100, 0, 0, 9000, 9000, 12000, 0, 10, 11, 12470, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,    'Bloodmage Thalnos - In Combat - Cast Fire Nova'),
+(4543, 0, 7, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 12, 14693, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 1797.84, 1233.68, 18.3153, 1.58286,  'Bloodmage Thalnos - On Just Died - Summon Creature \'Scorn\''), -- AC's wotlk version
+(4543, 0, 8, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 12, 614693, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 1797.84, 1233.68, 18.3153, 1.58286, 'Bloodmage Thalnos - On Just Died - Summon Creature \'Scorn\''), -- IP's vanilla version
+
 (6426, 0, 0, 0, 9, 0, 100, 0, 3000, 9000, 10000, 20000, 0, 20, 11, 7068, 32, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,  'Anguished Dead - Within 0-20 Range - Cast Veil of Shadows'),
 (6488, 0, 0, 0, 37, 0, 90, 512, 0, 0, 0, 0, 0, 0, 41, 500, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,                 'Fallen Champion - On AI Init - Despawn'),
 (6488, 0, 1, 0, 9, 0, 100, 0, 5000, 8000, 6000, 14000, 0, 5, 11, 15496, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,    'Fallen Champion - Within 0-5 Range - Cast Cleave'),
diff --git a/data/sql/world/base/si.sql b/data/sql/world/base/si.sql
index 936b8ad..2c9adb3 100644
--- a/data/sql/world/base/si.sql
+++ b/data/sql/world/base/si.sql
@@ -607,6 +607,7 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (@SCORN, 0, 0, 0, 106, 0, 100, 0, 4000, 9000, 8000, 15000, 0, 10, 11, 14907, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,                 'Scorn - In Combat - Cast Frost Nova'),
 (@SCORN, 0, 1, 0, 0, 0, 100, 0, 5000, 10000, 13000, 21000, 0, 0, 11, 8398, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,                   'Scorn - In Combat - Cast Frostbolt Volley'),
 (@SCORN, 0, 2, 0, 0, 0, 100, 0, 2000, 5000, 12000, 15000, 0, 0, 11, 28873, 1, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0,                   'Scorn - In Combat - Cast Lich Slap'),
+(@SCORN, 0, 3, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 0, 53, 0, 1469300, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0,                              'Scorn - On Just Summoned - Start Patrol Path 1469300'),
 (@LORD_BLACKWOOD, 0, 0, 0, 9, 0, 100, 0, 0, 0, 7000, 11000, 5, 30, 11, 21390, 64, 0, 0, 0, 0, 25, 30, 0, 0, 0, 0, 0, 0, 0,             'Lord Blackwood - On Victim In Range - Cast Multi-Shot'), 
 (@LORD_BLACKWOOD, 0, 1, 0, 0, 0, 100, 0, 2000, 5000, 12000, 15000, 0, 0, 11, 11972, 1, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0,          'Lord Blackwood - In Combat - Cast Shield Bash'),
 (@LORD_BLACKWOOD, 0, 2, 0, 106, 0, 100, 0, 13000, 13000, 15000, 15000, 0, 5, 11, 7964, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,       'Lord Blackwood - In Combat - Cast Smoke Bomb'),
@@ -656,6 +657,29 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (@SKELETAL_SHOCKTROOPER, 0, 3, 0, 8, 0, 100, 0, 17680, 0, 0, 0, 0, 0, 41, 3000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,              'Skeletal Shocktrooper - On Spellhit Spirit Spawn-out - Despawn In 3000 ms');
 
 
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND  `SourceGroup` = 9 AND `SourceEntry` = 4543;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, 
+`ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(22, 9, 4543, 0, 1, 8, 0, 66006, 0, 0, 0, 0, 0, '', 'Scorn will only spawn if the player has completed PROGRESSION_AQ'),
+(22, 9, 4543, 0, 1, 8, 0, 66007, 0, 0, 1, 0, 0, '', 'Scorn will only spawn if the player has NOT completed PROGRESSION_NAXX40');
+
+/* temporary - this will be done by playerbot's AC fork soon */
+SET @ENTRY := 14693;
+DELETE FROM `waypoints` WHERE `entry` = @ENTRY * 100;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES
+(@ENTRY*100, 1, 1798.01, 1312.39, 18.69,  NULL, 0, 'Scorn'),
+(@ENTRY*100, 2, 1805.39, 1323.66, 18.91,  NULL, 0, 'Scorn'),
+(@ENTRY*100, 3, 1797.70, 1383.27, 18.76,  NULL, 0, 'Scorn'),
+(@ENTRY*100, 4, 1805.39, 1323.66, 18.91,  NULL, 0, 'Scorn'),
+(@ENTRY*100, 5, 1798.01, 1312.39, 18.69,  NULL, 0, 'Scorn'),
+(@ENTRY*100, 6, 1798.01, 1223.17, 18.274, NULL, 0, 'Scorn - spawn point');
+
+/* temporary - this will be done by playerbot's AC fork soon */
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 22) AND (`SourceGroup` = 8) AND (`SourceEntry` = 4543) AND (`SourceId` = 0) AND (`ElseGroup` = 0);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(22, 8, 4543, 0, 0, 12, 0, 120, 0, 0, 0, 0, 0, '', 'Scourge Invasion - Boss in instance activation event must be active');
+
+
 /*-- Quests --*/
 
 -- Lieutenants, Investigate the Scourge
diff --git a/data/sql/world/base/si_creatures.sql b/data/sql/world/base/si_creatures.sql
index b86f52e..033b1b4 100644
--- a/data/sql/world/base/si_creatures.sql
+++ b/data/sql/world/base/si_creatures.sql
@@ -571,7 +571,7 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`,
 (@CGUID+592, @BALZAPHON,       0, 0, 329, 2017, 2017, 1, 1, 0, 3733.27, -3480.11, 131.04, 3.05433, 7200, 0, 0, 14652, 14604, 0, 0, 0, 0, '', 0, 0, NULL),
 (@CGUID+593, @LADY_FALTHERESS, 0, 0, 129, 722, 722, 1, 1, 0, 2583.18, 695.861, 56.8033, 1.8675, 7200, 0, 0, 8744, 4568, 0, 0, 0, 0, '', 0, 0, NULL),
 (@CGUID+594, @REVANCHION,      0, 0, 429, 2557, 2557, 1, 1, 0, -112.776, 583.823, -3.47887, 5.60251, 7200, 0, 0, 24420, 4868, 0, 0, 0, 0, '', 0, 0, NULL),
-(@CGUID+595, @SCORN,           0, 0, 189, 796, 796, 1, 1, 0, 1797.84, 1233.68, 18.3153, 1.58286, 7200, 0, 0, 7104, 5610, 0, 0, 0, 0, '', 0, 0, NULL),
+-- (@CGUID+595, @SCORN,           0, 0, 189, 796, 796, 1, 1, 0, 1797.84, 1233.68, 18.3153, 1.58286, 7200, 0, 0, 7104, 5610, 0, 0, 0, 0, '', 0, 0, NULL), -- now summoned after Bloodmage Thalnos dies
 (@CGUID+596, @LORD_BLACKWOOD,  0, 0, 289, 0, 0, 1, 1, 0, 200.201, 150.839, 109.879, 5.06145, 604800, 0, 0, 61040, 0, 2, 0, 0, 0, '', 0, 0, NULL),
 
 -- Ghoul Berserker