diff --git a/sql/world/base/dungeon_attunements.sql b/sql/world/base/dungeon_attunements.sql
index 0f1b96a..34fce3b 100644
--- a/sql/world/base/dungeon_attunements.sql
+++ b/sql/world/base/dungeon_attunements.sql
@@ -1,10 +1,10 @@
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (15, 2, 16309, NULL, 0, NULL, 0, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (16, 2, 16309, NULL, 0, NULL, 0, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (20, 1, 8182, NULL, 2, NULL, 1, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (32, 1, 10445, NULL, 2, NULL, 1, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (46, 1, 10901, NULL, 2, NULL, 1, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (47, 2, 31704, NULL, 0, NULL, 0, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (47, 1, 10888, NULL, 2, NULL, 1, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (62, 1, 10277, NULL, 2, NULL, 1, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (63, 1, 10277, NULL, 2, NULL, 1, NULL);
-INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (64, 1, 10984, NULL, 2, NULL, 1, NULL);
\ No newline at end of file
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (15, 2, 16309, NULL, 0, NULL, 0, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (16, 2, 16309, NULL, 0, NULL, 0, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (20, 1, 8182, NULL, 2, NULL, 1, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (32, 1, 10445, NULL, 2, NULL, 1, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (46, 1, 10901, NULL, 2, NULL, 1, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (47, 2, 31704, NULL, 0, NULL, 0, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (47, 1, 10888, NULL, 2, NULL, 1, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (62, 1, 10277, NULL, 2, NULL, 1, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (63, 1, 10277, NULL, 2, NULL, 1, NULL);
+REPLACE INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES (64, 1, 10984, NULL, 2, NULL, 1, NULL);
\ No newline at end of file
diff --git a/sql/world/base/professions.sql b/sql/world/base/professions.sql
index 7fb6295..0e9de9a 100644
--- a/sql/world/base/professions.sql
+++ b/sql/world/base/professions.sql
@@ -855,6 +855,31 @@ DELETE FROM creature WHERE `id1` IN (33676,
                                      35099,
                                      35101);
 
+-- TBC Recipes moved to trainers in 2.4.0
+DELETE FROM `npc_trainer` WHERE `SpellID` IN (28905, 34590, 28903, 28914, 28925, 28910, 28917, 28916, 28950, 28903);
+DELETE FROM npc_vendor WHERE item IN (23131, 28596, 23148, 23137, 23144, 23135, 23141, 23140, 23152, 23130);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23131);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23131);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 28596);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 28596);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23148);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23148);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23137);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23137);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23144);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23144);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23135);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23135);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23141);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23141);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23140);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23140);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23152);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23152);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18751, 0, 23130);
+INSERT INTO npc_vendor (entry, slot, item) VALUES (18774, 0, 23130);
+
+
 -- Delete added riding trainers
 DELETE FROM creature WHERE `id1` IN (35093, 35100);
 DELETE FROM creature_addon WHERE `guid` IN (88165, 88166);
\ No newline at end of file
diff --git a/sql/world/base/tbc_item_changes.sql b/sql/world/base/tbc_item_changes.sql
index 93ed8b1..34f2156 100644
--- a/sql/world/base/tbc_item_changes.sql
+++ b/sql/world/base/tbc_item_changes.sql
@@ -5063,7 +5063,7 @@ UPDATE `item_template` SET `stat_type3` = 30 WHERE entry=37928;
 UPDATE `item_template` SET `stat_type4` = 30 WHERE entry=37929;
 
 /*  Ruby Shades  */
-UPDATE `item_template` SET `BuyPrice` = 500000, `SellPrice` = 50000, `bonding` = 2 WHERE entry=38089;
+UPDATE `item_template` SET `BuyPrice` = 20000000, `SellPrice` = 50000, `bonding` = 2 WHERE entry=38089;
 
 /*  Direbrew Hops  */
 UPDATE `item_template` SET `spellcategorycooldown_2` = -1, `spellcategory_2` = 0 WHERE entry=38288;
diff --git a/sql/world/base/zone_shattrath.sql b/sql/world/base/zone_shattrath.sql
new file mode 100644
index 0000000..d5d8365
--- /dev/null
+++ b/sql/world/base/zone_shattrath.sql
@@ -0,0 +1,4 @@
+/* Restore Ruby Shades to Haris Pilton */
+DELETE FROM `npc_vendor` WHERE `entry`=18756 AND `item`=38089 AND `ExtendedCost`=0;
+INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`, `VerifiedBuild`) VALUES
+(18756, 0, 38089, 1, 1800, 0, 0);