Get the recipe databases to support the two new functions AddRecipeWorldDrop() and AddRecipeQuest()

diff --git a/Database/Alchemy.lua b/Database/Alchemy.lua
index 78c1875..20cdfb2 100644
--- a/Database/Alchemy.lua
+++ b/Database/Alchemy.lua
@@ -63,92 +63,92 @@ function addon:InitAlchemy()
 	-- Minor Mana Potion -- 2331
 	AddRecipe(2331, 25, 2455, Q.COMMON, V.ORIG, 25, 65, 85, 105)
 	self:AddRecipeFlags(2331, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2331, 1386, 2837, 17215, 4160, 3184, 2132, 27029, 3347, 4900, 16723, 27023, 3603, 33674, 1215, 4611, 33608, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 18802, 3009, 2391, 16642, 1246, 5499)
+	self:AddRecipeTrainer(2331, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 5499, 16723, 1246, 3603, 16642, 1215, 4611, 2391, 33608, 19052, 16588, 7948, 33674, 3964, 16161, 18802, 3009, 27023, 1470, 5177, 17215)

 	-- Minor Rejuvenation Potion -- 2332
 	AddRecipe(2332, 40, 2456, Q.COMMON, V.ORIG, 40, 70, 90, 110)
 	self:AddRecipeFlags(2332, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2332, 1386, 2837, 17215, 4160, 3184, 2132, 27029, 3347, 4900, 16723, 27023, 3603, 33674, 1215, 4611, 33608, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 18802, 3009, 2391, 16642, 1246, 5499)
+	self:AddRecipeTrainer(2332, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 5499, 16723, 1246, 3603, 16642, 1215, 4611, 2391, 33608, 19052, 16588, 7948, 33674, 3964, 16161, 18802, 3009, 27023, 1470, 5177, 17215)

 	-- Elixir of Lesser Agility -- 2333
 	AddRecipe(2333, 140, 3390, Q.UNCOMMON, V.ORIG, 140, 165, 185, 205)
 	self:AddRecipeFlags(2333, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(2333, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(2333, "Kalimdor", "Eastern Kingdoms")

 	-- Elixir of Minor Fortitude -- 2334
 	AddRecipe(2334, 50, 2458, Q.COMMON, V.ORIG, 50, 80, 100, 120)
 	self:AddRecipeFlags(2334, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2334, 1386, 2837, 17215, 4160, 3184, 2132, 27029, 3347, 4900, 16723, 27023, 3603, 33674, 1215, 4611, 33608, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 18802, 3009, 2391, 16642, 1246, 5499)
+	self:AddRecipeTrainer(2334, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 5499, 16723, 1246, 3603, 16642, 1215, 4611, 2391, 33608, 19052, 16588, 7948, 33674, 3964, 16161, 18802, 3009, 27023, 1470, 5177, 17215)

 	-- Swiftness Potion -- 2335
 	AddRecipe(2335, 60, 2459, Q.UNCOMMON, V.ORIG, 60, 90, 110, 130)
 	self:AddRecipeFlags(2335, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(2335, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(2335, "Kalimdor", "Eastern Kingdoms")

 	-- Lesser Healing Potion -- 2337
 	AddRecipe(2337, 55, 858, Q.COMMON, V.ORIG, 55, 85, 105, 125)
 	self:AddRecipeFlags(2337, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2337, 1386, 2837, 17215, 4160, 3184, 2132, 27029, 3347, 4900, 16723, 27023, 3603, 33674, 1215, 4611, 33608, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 18802, 3009, 2391, 16642, 1246, 5499)
+	self:AddRecipeTrainer(2337, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 5499, 16723, 1246, 3603, 16642, 1215, 4611, 2391, 33608, 19052, 16588, 7948, 33674, 3964, 16161, 18802, 3009, 27023, 1470, 5177, 17215)

 	-- Weak Troll's Blood Elixir -- 3170
 	AddRecipe(3170, 15, 3382, Q.COMMON, V.ORIG, 15, 60, 80, 100)
 	self:AddRecipeFlags(3170, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3170, 1386, 2837, 17215, 4160, 3184, 2132, 27029, 3347, 4900, 16723, 27023, 3603, 33674, 1215, 4611, 33608, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 18802, 3009, 2391, 16642, 1246, 5499)
+	self:AddRecipeTrainer(3170, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 5499, 16723, 1246, 3603, 16642, 1215, 4611, 2391, 33608, 19052, 16588, 7948, 33674, 3964, 16161, 18802, 3009, 27023, 1470, 5177, 17215)

 	-- Elixir of Wisdom -- 3171
 	AddRecipe(3171, 90, 3383, Q.COMMON, V.ORIG, 90, 120, 140, 160)
 	self:AddRecipeFlags(3171, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3171, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(3171, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Minor Magic Resistance Potion -- 3172
 	AddRecipe(3172, 110, 3384, Q.COMMON, V.ORIG, 110, 135, 155, 175)
 	self:AddRecipeFlags(3172, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3172, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(3172, "Kalimdor", "Eastern Kingdoms")

 	-- Lesser Mana Potion -- 3173
 	AddRecipe(3173, 120, 3385, Q.COMMON, V.ORIG, 120, 145, 165, 185)
 	self:AddRecipeFlags(3173, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3173, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(3173, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Potion of Curing -- 3174
 	AddRecipe(3174, 120, 3386, Q.COMMON, V.ORIG, 120, 145, 165, 185)
 	self:AddRecipeFlags(3174, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3174, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(3174, "Kalimdor", "Eastern Kingdoms")

 	-- Limited Invulnerability Potion -- 3175
 	AddRecipe(3175, 250, 3387, Q.UNCOMMON, V.ORIG, 250, 275, 295, 315)
 	self:AddRecipeFlags(3175, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3175, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(3175, "Kalimdor", "Eastern Kingdoms")

 	-- Strong Troll's Blood Elixir -- 3176
 	AddRecipe(3176, 125, 3388, Q.COMMON, V.ORIG, 125, 150, 170, 190)
 	self:AddRecipeFlags(3176, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3176, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(3176, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Elixir of Defense -- 3177
 	AddRecipe(3177, 130, 3389, Q.COMMON, V.ORIG, 130, 155, 175, 195)
 	self:AddRecipeFlags(3177, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeTrainer(3177, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(3177, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Elixir of Ogre's Strength -- 3188
 	AddRecipe(3188, 150, 3391, Q.COMMON, V.ORIG, 150, 175, 195, 215)
 	self:AddRecipeFlags(3188, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(3188, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(3188, "Kalimdor", "Eastern Kingdoms")

 	-- Elixir of Minor Agility -- 3230
 	AddRecipe(3230, 50, 2457, Q.UNCOMMON, V.ORIG, 50, 80, 100, 120)
 	self:AddRecipeFlags(3230, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(3230, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(3230, "Kalimdor", "Eastern Kingdoms")

 	-- Healing Potion -- 3447
 	AddRecipe(3447, 110, 929, Q.COMMON, V.ORIG, 110, 135, 155, 175)
 	self:AddRecipeFlags(3447, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3447, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(3447, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Lesser Invisibility Potion -- 3448
 	AddRecipe(3448, 165, 3823, Q.COMMON, V.ORIG, 165, 185, 205, 225)
 	self:AddRecipeFlags(3448, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3448, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(3448, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Shadow Oil -- 3449
 	AddRecipe(3449, 165, 3824, Q.COMMON, V.WOTLK, 165, 190, 210, 230)
@@ -158,23 +158,23 @@ function addon:InitAlchemy()
 	-- Elixir of Fortitude -- 3450
 	AddRecipe(3450, 175, 3825, Q.COMMON, V.ORIG, 175, 195, 215, 235)
 	self:AddRecipeFlags(3450, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(3450, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
-	self:AddRecipeAcquire(3450, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeTrainer(3450, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)
+	self:AddRecipeWorldDrop(3450, "Kalimdor", "Eastern Kingdoms")

 	-- Major Troll's Blood Elixir -- 3451
 	AddRecipe(3451, 180, 3826, Q.UNCOMMON, V.ORIG, 180, 200, 220, 240)
 	self:AddRecipeFlags(3451, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3451, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(3451, "Kalimdor", "Eastern Kingdoms")

 	-- Mana Potion -- 3452
 	AddRecipe(3452, 160, 3827, Q.COMMON, V.ORIG, 160, 180, 200, 220)
 	self:AddRecipeFlags(3452, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3452, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(3452, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Elixir of Detect Lesser Invisibility -- 3453
 	AddRecipe(3453, 195, 3828, Q.UNCOMMON, V.ORIG, 195, 215, 235, 255)
 	self:AddRecipeFlags(3453, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3453, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(3453, "Kalimdor", "Eastern Kingdoms")

 	-- Frost Oil -- 3454
 	AddRecipe(3454, 200, 3829, Q.UNCOMMON, V.ORIG, 200, 220, 240, 260)
@@ -184,12 +184,12 @@ function addon:InitAlchemy()
 	-- Discolored Healing Potion -- 4508
 	AddRecipe(4508, 50, 4596, Q.UNCOMMON, V.ORIG, 50, 80, 100, 120)
 	self:AddRecipeFlags(4508, F.HORDE, F.QUEST, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(4508, A.QUEST, 429)
+	self:AddRecipeQuest(4508, 429)

 	-- Lesser Stoneshield Potion -- 4942
 	AddRecipe(4942, 215, 4623, Q.COMMON, V.ORIG, 215, 230, 250, 270)
 	self:AddRecipeFlags(4942, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(4942, A.QUEST, 715)
+	self:AddRecipeQuest(4942, 715)

 	-- Rage Potion -- 6617
 	AddRecipe(6617, 60, 5631, Q.COMMON, V.ORIG, 60, 90, 110, 130)
@@ -209,12 +209,12 @@ function addon:InitAlchemy()
 	-- Elixir of Water Breathing -- 7179
 	AddRecipe(7179, 90, 5996, Q.COMMON, V.ORIG, 90, 120, 140, 160)
 	self:AddRecipeFlags(7179, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(7179, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(7179, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Greater Healing Potion -- 7181
 	AddRecipe(7181, 155, 1710, Q.COMMON, V.ORIG, 155, 175, 195, 215)
 	self:AddRecipeFlags(7181, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(7181, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(7181, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Elixir of Minor Defense -- 7183
 	AddRecipe(7183, 1, 5997, Q.COMMON, V.ORIG, 1, 55, 75, 95)
@@ -249,57 +249,57 @@ function addon:InitAlchemy()
 	-- Blackmouth Oil -- 7836
 	AddRecipe(7836, 80, 6370, Q.COMMON, V.ORIG, 80, 80, 90, 100)
 	self:AddRecipeFlags(7836, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(7836, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(7836, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Fire Oil -- 7837
 	AddRecipe(7837, 130, 6371, Q.COMMON, V.ORIG, 130, 150, 160, 170)
 	self:AddRecipeFlags(7837, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(7837, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(7837, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Swim Speed Potion -- 7841
 	AddRecipe(7841, 100, 6372, Q.COMMON, V.ORIG, 100, 130, 150, 170)
 	self:AddRecipeFlags(7841, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(7841, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(7841, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Elixir of Firepower -- 7845
 	AddRecipe(7845, 140, 6373, Q.COMMON, V.ORIG, 140, 165, 185, 205)
 	self:AddRecipeFlags(7845, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(7845, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(7845, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Elixir of Giant Growth -- 8240
 	AddRecipe(8240, 90, 6662, Q.UNCOMMON, V.ORIG, 90, 120, 140, 160)
 	self:AddRecipeFlags(8240, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(8240, A.WORLD_DROP, "The Barrens")
+	self:AddRecipeWorldDrop(8240, "The Barrens")

 	-- Greater Mana Potion -- 11448
 	AddRecipe(11448, 205, 6149, Q.COMMON, V.ORIG, 205, 220, 240, 260)
 	self:AddRecipeFlags(11448, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(11448, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(11448, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Elixir of Agility -- 11449
 	AddRecipe(11449, 185, 8949, Q.COMMON, V.ORIG, 185, 205, 225, 245)
 	self:AddRecipeFlags(11449, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(11449, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(11449, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Elixir of Greater Defense -- 11450
 	AddRecipe(11450, 195, 8951, Q.COMMON, V.ORIG, 195, 215, 235, 255)
 	self:AddRecipeFlags(11450, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeTrainer(11450, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(11450, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Oil of Immolation -- 11451
 	AddRecipe(11451, 205, 8956, Q.COMMON, V.ORIG, 205, 220, 240, 260)
 	self:AddRecipeFlags(11451, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(11451, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(11451, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Restorative Potion -- 11452
 	AddRecipe(11452, 210, 9030, Q.COMMON, V.ORIG, 210, 225, 245, 265)
 	self:AddRecipeFlags(11452, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(11452, A.QUEST, 2203, A.QUEST, 2501)
+	self:AddRecipeQuest(11452, 2203, 2501)

 	-- Magic Resistance Potion -- 11453
 	AddRecipe(11453, 210, 9036, Q.UNCOMMON, V.ORIG, 210, 225, 245, 265)
 	self:AddRecipeFlags(11453, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(11453, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(11453, "Kalimdor", "Eastern Kingdoms")

 	-- Goblin Rocket Fuel -- 11456
 	AddRecipe(11456, 210, 9061, Q.COMMON, V.ORIG, 210, 225, 245, 265)
@@ -309,12 +309,12 @@ function addon:InitAlchemy()
 	-- Superior Healing Potion -- 11457
 	AddRecipe(11457, 215, 3928, Q.COMMON, V.ORIG, 215, 230, 250, 270)
 	self:AddRecipeFlags(11457, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(11457, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(11457, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Wildvine Potion -- 11458
 	AddRecipe(11458, 225, 9144, Q.UNCOMMON, V.ORIG, 225, 240, 260, 280)
 	self:AddRecipeFlags(11458, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(11458, A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(11458, "Eastern Kingdoms")

 	-- Philosopher's Stone -- 11459
 	AddRecipe(11459, 225, 9149, Q.COMMON, V.ORIG, 225, 240, 260, 280)
@@ -324,22 +324,22 @@ function addon:InitAlchemy()
 	-- Elixir of Detect Undead -- 11460
 	AddRecipe(11460, 230, 9154, Q.COMMON, V.ORIG, 230, 245, 265, 285)
 	self:AddRecipeFlags(11460, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(11460, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(11460, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Arcane Elixir -- 11461
 	AddRecipe(11461, 235, 9155, Q.COMMON, V.ORIG, 235, 250, 270, 290)
 	self:AddRecipeFlags(11461, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(11461, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(11461, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Invisibility Potion -- 11464
 	AddRecipe(11464, 235, 9172, Q.UNCOMMON, V.ORIG, 235, 250, 270, 290)
 	self:AddRecipeFlags(11464, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(11464, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(11464, "Kalimdor", "Eastern Kingdoms")

 	-- Elixir of Greater Intellect -- 11465
 	AddRecipe(11465, 235, 9179, Q.COMMON, V.ORIG, 235, 250, 270, 290)
 	self:AddRecipeFlags(11465, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(11465, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(11465, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Gift of Arthas -- 11466
 	AddRecipe(11466, 240, 9088, Q.UNCOMMON, V.ORIG, 240, 255, 275, 295)
@@ -349,17 +349,17 @@ function addon:InitAlchemy()
 	-- Elixir of Greater Agility -- 11467
 	AddRecipe(11467, 240, 9187, Q.COMMON, V.ORIG, 240, 255, 275, 295)
 	self:AddRecipeFlags(11467, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(11467, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(11467, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Elixir of Dream Vision -- 11468
 	AddRecipe(11468, 240, 9197, Q.UNCOMMON, V.ORIG, 240, 255, 275, 295)
 	self:AddRecipeFlags(11468, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(11468, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(11468, "Kalimdor", "Eastern Kingdoms")

 	-- Elixir of Giants -- 11472
 	AddRecipe(11472, 245, 9206, Q.UNCOMMON, V.ORIG, 245, 260, 280, 300)
 	self:AddRecipeFlags(11472, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(11472, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(11472, "Kalimdor", "Eastern Kingdoms")

 	-- Ghost Dye -- 11473
 	AddRecipe(11473, 245, 9210, Q.COMMON, V.ORIG, 245, 260, 280, 300)
@@ -379,7 +379,7 @@ function addon:InitAlchemy()
 	-- Elixir of Detect Demon -- 11478
 	AddRecipe(11478, 250, 9233, Q.COMMON, V.ORIG, 250, 265, 285, 305)
 	self:AddRecipeFlags(11478, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(11478, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(11478, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Transmute: Iron to Gold -- 11479
 	AddRecipe(11479, 225, 3577, Q.COMMON, V.ORIG, 225, 240, 260, 280)
@@ -394,12 +394,12 @@ function addon:InitAlchemy()
 	-- Catseye Elixir -- 12609
 	AddRecipe(12609, 200, 10592, Q.COMMON, V.ORIG, 200, 220, 240, 260)
 	self:AddRecipeFlags(12609, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12609, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(12609, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 4160, 1215, 4611, 33608, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Dreamless Sleep Potion -- 15833
 	AddRecipe(15833, 230, 12190, Q.COMMON, V.ORIG, 230, 245, 265, 285)
 	self:AddRecipeFlags(15833, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(15833, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(15833, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Transmute: Arcanite -- 17187
 	AddRecipe(17187, 275, 12360, Q.COMMON, V.ORIG, 275, 275, 282, 290)
@@ -409,17 +409,17 @@ function addon:InitAlchemy()
 	-- Stonescale Oil -- 17551
 	AddRecipe(17551, 250, 13423, Q.COMMON, V.ORIG, 250, 250, 255, 260)
 	self:AddRecipeFlags(17551, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(17551, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(17551, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Mighty Rage Potion -- 17552
 	AddRecipe(17552, 255, 13442, Q.UNCOMMON, V.ORIG, 255, 270, 290, 310)
 	self:AddRecipeFlags(17552, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.WARRIOR, F.IBOE, F.RBOE, F.DPS, F.TANK)
-	self:AddRecipeTrainer(17552, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(17552, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Superior Mana Potion -- 17553
 	AddRecipe(17553, 260, 13443, Q.COMMON, V.ORIG, 260, 275, 295, 315)
 	self:AddRecipeFlags(17553, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(17553, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(17553, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Elixir of Superior Defense -- 17554
 	AddRecipe(17554, 265, 13445, Q.COMMON, V.ORIG, 265, 280, 300, 320)
@@ -429,17 +429,17 @@ function addon:InitAlchemy()
 	-- Elixir of the Sages -- 17555
 	AddRecipe(17555, 270, 13447, Q.UNCOMMON, V.ORIG, 270, 285, 305, 325)
 	self:AddRecipeFlags(17555, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(17555, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(17555, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Major Healing Potion -- 17556
 	AddRecipe(17556, 275, 13446, Q.COMMON, V.ORIG, 275, 290, 310, 330)
 	self:AddRecipeFlags(17556, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(17556, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(17556, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Elixir of Brute Force -- 17557
 	AddRecipe(17557, 275, 13453, Q.UNCOMMON, V.ORIG, 275, 290, 310, 330)
 	self:AddRecipeFlags(17557, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(17557, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(17557, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Transmute: Air to Fire -- 17559
 	AddRecipe(17559, 275, 7078, Q.UNCOMMON, V.ORIG, 275, 275, 282, 290)
@@ -464,27 +464,27 @@ function addon:InitAlchemy()
 	-- Transmute: Undeath to Water -- 17563
 	AddRecipe(17563, 275, 7080, Q.UNCOMMON, V.ORIG, 275, 275, 282, 290)
 	self:AddRecipeFlags(17563, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(17563, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(17563, "Kalimdor", "Eastern Kingdoms")

 	-- Transmute: Water to Undeath -- 17564
 	AddRecipe(17564, 275, 12808, Q.UNCOMMON, V.ORIG, 275, 275, 282, 290)
 	self:AddRecipeFlags(17564, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(17564, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(17564, "Kalimdor", "Eastern Kingdoms")

 	-- Transmute: Life to Earth -- 17565
 	AddRecipe(17565, 275, 7076, Q.UNCOMMON, V.ORIG, 275, 275, 282, 290)
 	self:AddRecipeFlags(17565, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(17565, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(17565, "Kalimdor", "Eastern Kingdoms")

 	-- Transmute: Earth to Life -- 17566
 	AddRecipe(17566, 275, 12803, Q.UNCOMMON, V.ORIG, 275, 275, 282, 290)
 	self:AddRecipeFlags(17566, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(17566, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(17566, "Kalimdor", "Eastern Kingdoms")

 	-- Greater Stoneshield Potion -- 17570
 	AddRecipe(17570, 280, 13455, Q.UNCOMMON, V.ORIG, 280, 295, 315, 335)
 	self:AddRecipeFlags(17570, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(17570, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(17570, "Kalimdor", "Eastern Kingdoms")

 	-- Elixir of the Mongoose -- 17571
 	AddRecipe(17571, 280, 13452, Q.UNCOMMON, V.ORIG, 280, 295, 315, 335)
@@ -494,12 +494,12 @@ function addon:InitAlchemy()
 	-- Purification Potion -- 17572
 	AddRecipe(17572, 285, 13462, Q.UNCOMMON, V.ORIG, 285, 300, 320, 340)
 	self:AddRecipeFlags(17572, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(17572, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(17572, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Greater Arcane Elixir -- 17573
 	AddRecipe(17573, 285, 13454, Q.UNCOMMON, V.ORIG, 285, 300, 320, 340)
 	self:AddRecipeFlags(17573, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(17573, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 1215, 18802, 4611, 5499, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 16642, 33608)
+	self:AddRecipeTrainer(17573, 1386, 2837, 4900, 4160, 3184, 2132, 27029, 3347, 16723, 3603, 33608, 1215, 4611, 16642, 5177, 19052, 16588, 5499, 1470, 3964, 16161, 33674, 3009, 27023, 2391, 7948, 18802)

 	-- Greater Fire Protection Potion -- 17574
 	AddRecipe(17574, 290, 13457, Q.UNCOMMON, V.ORIG, 290, 305, 325, 345)
@@ -540,7 +540,7 @@ function addon:InitAlchemy()
 	-- Potion of Petrification -- 17634
 	AddRecipe(17634, 300, 13506, Q.UNCOMMON, V.ORIG, 300, 315, 322, 330)
 	self:AddRecipeFlags(17634, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(17634, A.WORLD_DROP, "Kalimdor", A.WORLD_DROP, "Eastern Kingdoms")
+	self:AddRecipeWorldDrop(17634, "Kalimdor", "Eastern Kingdoms")

 	-- Flask of the Titans -- 17635
 	AddRecipe(17635, 300, 13510, Q.UNCOMMON, V.TBC, 300, 315, 322, 330)
@@ -579,7 +579,7 @@ function addon:InitAlchemy()
 	-- Elixir of Greater Water Breathing -- 22808
 	AddRecipe(22808, 215, 18294, Q.COMMON, V.ORIG, 215, 230, 250, 270)
 	self:AddRecipeFlags(22808, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(22808, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 27023, 3009, 2391, 33674, 33608, 4160)
+	self:AddRecipeTrainer(22808, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 33674, 2391, 1215)

 	-- Gurubashi Mojo Madness -- 24266
 	AddRecipe(24266, 300, 19931, Q.RARE, V.ORIG, 300, 315, 322, 330)
@@ -619,17 +619,17 @@ function addon:InitAlchemy()
 	-- Elixir of Camouflage -- 28543
 	AddRecipe(28543, 305, 22823, Q.COMMON, V.TBC, 305, 320, 327, 335)
 	self:AddRecipeFlags(28543, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(28543, 16588, 18802, 16641, 16705)
+	self:AddRecipeVendor(28543, 18802, 16705, 16641, 16588)

 	-- Elixir of Major Strength -- 28544
 	AddRecipe(28544, 305, 22824, Q.COMMON, V.TBC, 305, 320, 327, 335)
 	self:AddRecipeFlags(28544, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(28544, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(28544, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Elixir of Healing Power -- 28545
 	AddRecipe(28545, 310, 22825, Q.COMMON, V.TBC, 310, 325, 332, 340)
 	self:AddRecipeFlags(28545, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(28545, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(28545, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Sneaking Potion -- 28546
 	AddRecipe(28546, 315, 22826, Q.COMMON, V.TBC, 315, 330, 337, 345)
@@ -644,17 +644,17 @@ function addon:InitAlchemy()
 	-- Insane Strength Potion -- 28550
 	AddRecipe(28550, 320, 22828, Q.UNCOMMON, V.TBC, 320, 335, 342, 350)
 	self:AddRecipeFlags(28550, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(28550, A.WORLD_DROP, "Outland")
+	self:AddRecipeWorldDrop(28550, "Outland")

 	-- Super Healing Potion -- 28551
 	AddRecipe(28551, 325, 22829, Q.COMMON, V.TBC, 325, 340, 347, 355)
 	self:AddRecipeFlags(28551, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(28551, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(28551, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Elixir of the Searching Eye -- 28552
 	AddRecipe(28552, 325, 22830, Q.UNCOMMON, V.TBC, 325, 340, 347, 355)
 	self:AddRecipeFlags(28552, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(28552, A.WORLD_DROP, "Outland")
+	self:AddRecipeWorldDrop(28552, "Outland")

 	-- Elixir of Major Agility -- 28553
 	AddRecipe(28553, 330, 22831, Q.COMMON, V.TBC, 330, 345, 352, 360)
@@ -695,7 +695,7 @@ function addon:InitAlchemy()
 	-- Heroic Potion -- 28563
 	AddRecipe(28563, 350, 22837, Q.UNCOMMON, V.TBC, 350, 365, 372, 380)
 	self:AddRecipeFlags(28563, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(28563, A.WORLD_DROP, "Outland")
+	self:AddRecipeWorldDrop(28563, "Outland")

 	-- Haste Potion -- 28564
 	AddRecipe(28564, 350, 22838, Q.UNCOMMON, V.TBC, 350, 365, 372, 380)
@@ -705,7 +705,7 @@ function addon:InitAlchemy()
 	-- Destruction Potion -- 28565
 	AddRecipe(28565, 350, 22839, Q.UNCOMMON, V.TBC, 350, 365, 372, 380)
 	self:AddRecipeFlags(28565, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(28565, A.WORLD_DROP, "Outland")
+	self:AddRecipeWorldDrop(28565, "Outland")

 	-- Transmute: Primal Air to Fire -- 28566
 	AddRecipe(28566, 350, 21884, Q.UNCOMMON, V.TBC, 350, 365, 372, 380)
@@ -730,7 +730,7 @@ function addon:InitAlchemy()
 	-- Elixir of Major Mageblood -- 28570
 	AddRecipe(28570, 355, 22840, Q.UNCOMMON, V.TBC, 355, 370, 375, 380)
 	self:AddRecipeFlags(28570, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(28570, A.WORLD_DROP, "Outland")
+	self:AddRecipeWorldDrop(28570, "Outland")

 	-- Major Fire Protection Potion -- 28571
 	AddRecipe(28571, 360, 22841, Q.UNCOMMON, V.TBC, 360, 375, 377, 380)
@@ -766,7 +766,7 @@ function addon:InitAlchemy()
 	AddRecipe(28578, 365, 22848, Q.UNCOMMON, V.TBC, 365, 375, 377, 380)
 	self:AddRecipeFlags(28578, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.MOB_DROP, F.IBOE, F.RBOP)
 	self:AddRecipeMobDrop(28578, 24664)
-	self:AddRecipeAcquire(28578, A.WORLD_DROP, "Outland")
+	self:AddRecipeWorldDrop(28578, "Outland")

 	-- Ironshield Potion -- 28579
 	AddRecipe(28579, 365, 22849, Q.UNCOMMON, V.TBC, 365, 375, 377, 380)
@@ -852,52 +852,52 @@ function addon:InitAlchemy()
 	-- Volatile Healing Potion -- 33732
 	AddRecipe(33732, 300, 28100, Q.COMMON, V.TBC, 300, 315, 322, 330)
 	self:AddRecipeFlags(33732, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(33732, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(33732, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Unstable Mana Potion -- 33733
 	AddRecipe(33733, 310, 28101, Q.COMMON, V.TBC, 310, 325, 332, 340)
 	self:AddRecipeFlags(33733, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(33733, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(33733, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Onslaught Elixir -- 33738
 	AddRecipe(33738, 300, 28102, Q.COMMON, V.TBC, 300, 315, 322, 330)
 	self:AddRecipeFlags(33738, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(33738, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(33738, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Adept's Elixir -- 33740
 	AddRecipe(33740, 300, 28103, Q.COMMON, V.ORIG, 300, 315, 322, 330)
 	self:AddRecipeFlags(33740, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(33740, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(33740, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Elixir of Mastery -- 33741
 	AddRecipe(33741, 315, 28104, Q.COMMON, V.TBC, 315, 330, 337, 345)
 	self:AddRecipeFlags(33741, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(33741, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(33741, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Mercurial Stone -- 38070
 	AddRecipe(38070, 325, 31080, Q.COMMON, V.TBC, 325, 340, 347, 355)
 	self:AddRecipeFlags(38070, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TRINKET)
-	self:AddRecipeTrainer(38070, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(38070, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Fel Strength Elixir -- 38960
 	AddRecipe(38960, 335, 31679, Q.RARE, V.TBC, 335, 350, 357, 365)
 	self:AddRecipeFlags(38960, F.ALLIANCE, F.HORDE, F.MOB_DROP, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeMobDrop(38960, 21314, 21302, 19755, 19740)
+	self:AddRecipeMobDrop(38960, 19740, 21302, 19755, 21314)

 	-- Fel Mana Potion -- 38961
 	AddRecipe(38961, 360, 31677, Q.RARE, V.TBC, 360, 375, 377, 380)
 	self:AddRecipeFlags(38961, F.ALLIANCE, F.HORDE, F.MOB_DROP, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeMobDrop(38961, 19795, 19792, 22076, 22017, 22093, 22018, 19796, 19806, 22016)
+	self:AddRecipeMobDrop(38961, 19795, 19792, 22076, 22017, 22016, 22018, 19796, 19806, 22093)

 	-- Fel Regeneration Potion -- 38962
 	AddRecipe(38962, 345, 31676, Q.RARE, V.TBC, 345, 360, 367, 375)
 	self:AddRecipeFlags(38962, F.ALLIANCE, F.HORDE, F.MOB_DROP, F.IBOE, F.RBOP)
-	self:AddRecipeMobDrop(38962, 19756, 19754, 20887, 20878)
+	self:AddRecipeMobDrop(38962, 19756, 19754, 20878, 20887)

 	-- Elixir of Major Fortitude -- 39636
 	AddRecipe(39636, 310, 32062, Q.COMMON, V.TBC, 310, 325, 332, 340)
 	self:AddRecipeFlags(39636, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(39636, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(39636, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Earthen Elixir -- 39637
 	AddRecipe(39637, 320, 32063, Q.COMMON, V.TBC, 320, 335, 342, 350)
@@ -907,7 +907,7 @@ function addon:InitAlchemy()
 	-- Elixir of Draenic Wisdom -- 39638
 	AddRecipe(39638, 320, 32067, Q.COMMON, V.TBC, 320, 335, 342, 350)
 	self:AddRecipeFlags(39638, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(39638, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(39638, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Elixir of Ironskin -- 39639
 	AddRecipe(39639, 330, 32068, Q.COMMON, V.TBC, 330, 345, 352, 360)
@@ -947,7 +947,7 @@ function addon:InitAlchemy()
 	-- Mad Alchemist's Potion -- 45061
 	AddRecipe(45061, 325, 34440, Q.COMMON, V.TBC, 325, 335, 342, 350)
 	self:AddRecipeFlags(45061, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45061, 18802, 33674, 27029, 27023, 33608, 16588, 19052)
+	self:AddRecipeTrainer(45061, 18802, 19052, 33674, 27023, 33608, 16588, 27029)

 	-- Guardian's Alchemist Stone -- 47046
 	AddRecipe(47046, 375, 35748, Q.COMMON, V.TBC, 375, 380, 385, 390)
@@ -1032,52 +1032,52 @@ function addon:InitAlchemy()
 	-- Pygmy Oil -- 53812
 	AddRecipe(53812, 375, 40195, Q.COMMON, V.WOTLK, 375, 380, 385, 390)
 	self:AddRecipeFlags(53812, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53812, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53812, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Runic Healing Potion -- 53836
 	AddRecipe(53836, 405, 33447, Q.COMMON, V.WOTLK, 405, 415, 420, 425)
 	self:AddRecipeFlags(53836, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53836, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53836, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Runic Mana Potion -- 53837
 	AddRecipe(53837, 410, 33448, Q.COMMON, V.WOTLK, 410, 420, 425, 430)
 	self:AddRecipeFlags(53837, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53837, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53837, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Resurgent Healing Potion -- 53838
 	AddRecipe(53838, 350, 39671, Q.COMMON, V.WOTLK, 350, 360, 365, 370)
 	self:AddRecipeFlags(53838, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53838, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53838, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Icy Mana Potion -- 53839
 	AddRecipe(53839, 360, 40067, Q.COMMON, V.WOTLK, 360, 370, 375, 380)
 	self:AddRecipeFlags(53839, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53839, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53839, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Elixir of Mighty Agility -- 53840
 	AddRecipe(53840, 395, 39666, Q.COMMON, V.WOTLK, 395, 405, 410, 415)
 	self:AddRecipeFlags(53840, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(53840, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53840, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Wrath Elixir -- 53841
 	AddRecipe(53841, 355, 40068, Q.COMMON, V.WOTLK, 355, 365, 370, 375)
 	self:AddRecipeFlags(53841, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(53841, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53841, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Spellpower Elixir -- 53842
 	AddRecipe(53842, 365, 40070, Q.COMMON, V.WOTLK, 365, 375, 380, 385)
 	self:AddRecipeFlags(53842, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(53842, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53842, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Elixir of Spirit -- 53847
 	AddRecipe(53847, 385, 40072, Q.COMMON, V.WOTLK, 385, 395, 400, 405)
 	self:AddRecipeFlags(53847, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(53847, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53847, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Guru's Elixir -- 53848
 	AddRecipe(53848, 375, 40076, Q.COMMON, V.WOTLK, 375, 385, 390, 395)
 	self:AddRecipeFlags(53848, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53848, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53848, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Crazy Alchemist's Potion -- 53895
 	AddRecipe(53895, 400, 40077, Q.COMMON, V.WOTLK, 400, 410, 415, 420)
@@ -1087,32 +1087,32 @@ function addon:InitAlchemy()
 	-- Elixir of Mighty Fortitude -- 53898
 	AddRecipe(53898, 390, 40078, Q.COMMON, V.WOTLK, 390, 400, 405, 410)
 	self:AddRecipeFlags(53898, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53898, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53898, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Lesser Flask of Toughness -- 53899
 	AddRecipe(53899, 375, 40079, Q.COMMON, V.WOTLK, 375, 385, 390, 395)
 	self:AddRecipeFlags(53899, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53899, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53899, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Potion of Nightmares -- 53900
 	AddRecipe(53900, 380, 40081, Q.COMMON, V.WOTLK, 380, 390, 395, 400)
 	self:AddRecipeFlags(53900, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53900, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53900, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Flask of the Frost Wyrm -- 53901
 	AddRecipe(53901, 435, 40082, Q.COMMON, V.WOTLK, 435, 450, 457, 465)
 	self:AddRecipeFlags(53901, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(53901, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53901, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Flask of Stoneblood -- 53902
 	AddRecipe(53902, 435, 40083, Q.COMMON, V.WOTLK, 435, 450, 457, 465)
 	self:AddRecipeFlags(53902, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53902, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53902, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Flask of Endless Rage -- 53903
 	AddRecipe(53903, 435, 40084, Q.COMMON, V.WOTLK, 435, 450, 457, 465)
 	self:AddRecipeFlags(53903, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(53903, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53903, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Powerful Rejuvenation Potion -- 53904
 	AddRecipe(53904, 400, 40087, Q.COMMON, V.WOTLK, 400, 410, 415, 420)
@@ -1122,7 +1122,7 @@ function addon:InitAlchemy()
 	-- Indestructible Potion -- 53905
 	AddRecipe(53905, 395, 40093, Q.COMMON, V.WOTLK, 395, 405, 410, 415)
 	self:AddRecipeFlags(53905, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53905, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(53905, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Mighty Arcane Protection Potion -- 53936
 	AddRecipe(53936, 400, 40213, Q.UNCOMMON, V.WOTLK, 400, 410, 415, 420)
@@ -1152,12 +1152,12 @@ function addon:InitAlchemy()
 	-- Flask of Pure Mojo -- 54213
 	AddRecipe(54213, 435, 40404, Q.COMMON, V.WOTLK, 435, 450, 457, 465)
 	self:AddRecipeFlags(54213, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(54213, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(54213, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Elixir of Mighty Strength -- 54218
 	AddRecipe(54218, 385, 40073, Q.COMMON, V.WOTLK, 385, 395, 400, 405)
 	self:AddRecipeFlags(54218, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(54218, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(54218, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Elixir of Protection -- 54220
 	AddRecipe(54220, 400, 40097, Q.COMMON, V.WOTLK, 400, 410, 415, 420)
@@ -1182,27 +1182,27 @@ function addon:InitAlchemy()
 	-- Transmute: Skyflare Diamond -- 57425
 	AddRecipe(57425, 430, 41266, Q.RARE, V.WOTLK, 430, 440, 445, 450)
 	self:AddRecipeFlags(57425, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57425, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(57425, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Transmute: Earthsiege Diamond -- 57427
 	AddRecipe(57427, 425, 41334, Q.RARE, V.WOTLK, 425, 435, 440, 445)
 	self:AddRecipeFlags(57427, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57427, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(57427, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Endless Mana Potion -- 58868
 	AddRecipe(58868, 410, 43570, Q.COMMON, V.WOTLK, 410, 420, 425, 430)
 	self:AddRecipeFlags(58868, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(58868, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(58868, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Endless Healing Potion -- 58871
 	AddRecipe(58871, 410, 43569, Q.COMMON, V.WOTLK, 410, 420, 425, 430)
 	self:AddRecipeFlags(58871, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(58871, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(58871, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Transmute: Titanium -- 60350
 	AddRecipe(60350, 395, 41163, Q.UNCOMMON, V.WOTLK, 395, 405, 410, 415)
 	self:AddRecipeFlags(60350, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(60350, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(60350, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Elixir of Accuracy -- 60354
 	AddRecipe(60354, 400, 44325, Q.COMMON, V.WOTLK, 400, 415, 422, 430)
@@ -1237,37 +1237,37 @@ function addon:InitAlchemy()
 	-- Elixir of Mighty Thoughts -- 60367
 	AddRecipe(60367, 395, 44332, Q.COMMON, V.WOTLK, 395, 405, 410, 415)
 	self:AddRecipeFlags(60367, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(60367, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(60367, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Mercurial Alchemist Stone -- 60396
 	AddRecipe(60396, 400, 44322, Q.RARE, V.WOTLK, 400, 410, 415, 420)
 	self:AddRecipeFlags(60396, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.HEALER, F.CASTER, F.TRINKET)
-	self:AddRecipeTrainer(60396, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(60396, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Indestructible Alchemist Stone -- 60403
 	AddRecipe(60403, 400, 44323, Q.RARE, V.WOTLK, 400, 410, 415, 420)
 	self:AddRecipeFlags(60403, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.TANK, F.TRINKET)
-	self:AddRecipeTrainer(60403, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(60403, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Mighty Alchemist Stone -- 60405
 	AddRecipe(60405, 400, 44324, Q.RARE, V.WOTLK, 400, 410, 415, 420)
 	self:AddRecipeFlags(60405, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TRINKET)
-	self:AddRecipeTrainer(60405, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(60405, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Northrend Alchemy Research -- 60893
 	AddRecipe(60893, 400, nil, Q.COMMON, V.WOTLK, 400, 410, 415, 420)
 	self:AddRecipeFlags(60893, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(60893, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(60893, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Lesser Flask of Resistance -- 62213
 	AddRecipe(62213, 385, 44939, Q.COMMON, V.WOTLK, 385, 395, 400, 405)
 	self:AddRecipeFlags(62213, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(62213, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(62213, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Ethereal Oil -- 62409
 	AddRecipe(62409, 375, 44958, Q.COMMON, V.WOTLK, 375, 385, 390, 395)
 	self:AddRecipeFlags(62409, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(62409, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(62409, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Elixir of Water Walking -- 62410
 	AddRecipe(62410, 400, 8827, Q.COMMON, V.WOTLK, 400, 410, 415, 420)
@@ -1277,42 +1277,42 @@ function addon:InitAlchemy()
 	-- Elixir of Minor Accuracy -- 63732
 	AddRecipe(63732, 135, 45621, Q.COMMON, V.WOTLK, 135, 160, 180, 200)
 	self:AddRecipeFlags(63732, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(63732, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 27023, 18802, 4611, 1215, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33674, 3009, 2391, 33608, 4160, 5499)
+	self:AddRecipeTrainer(63732, 1386, 2837, 4900, 16642, 3184, 2132, 27029, 3347, 16723, 3603, 5499, 18802, 4611, 4160, 5177, 19052, 16588, 7948, 1470, 3964, 16161, 33608, 3009, 27023, 2391, 33674, 1215)

 	-- Transmute: Ametrine -- 66658
 	AddRecipe(66658, 450, 36931, Q.COMMON, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66658, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(66658, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(66658, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Transmute: Cardinal Ruby -- 66659
 	AddRecipe(66659, 450, 36919, Q.COMMON, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66659, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(66659, A.QUEST, 14151)
+	self:AddRecipeQuest(66659, 14151)

 	-- Transmute: King's Amber -- 66660
 	AddRecipe(66660, 450, 36922, Q.COMMON, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66660, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(66660, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(66660, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Transmute: Dreadstone -- 66662
 	AddRecipe(66662, 450, 36928, Q.COMMON, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66662, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(66662, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(66662, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Transmute: Majestic Zircon -- 66663
 	AddRecipe(66663, 450, 36925, Q.COMMON, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66663, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(66663, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(66663, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Transmute: Eye of Zul -- 66664
 	AddRecipe(66664, 450, 36934, Q.COMMON, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66664, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(66664, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(66664, 26951, 26903, 28703, 26975, 26987, 33588)

 	-- Flask of the North -- 67025
 	AddRecipe(67025, 425, 47499, Q.COMMON, V.WOTLK, 425, 440, 445, 450)
 	self:AddRecipeFlags(67025, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(67025, 26951, 26903, 28703, 26975, 33588, 26987)
+	self:AddRecipeTrainer(67025, 26951, 26903, 28703, 26975, 26987, 33588)

 	return num_recipes
 end
diff --git a/Database/Blacksmithing.lua b/Database/Blacksmithing.lua
index 220f4d2..6c7781f 100644
--- a/Database/Blacksmithing.lua
+++ b/Database/Blacksmithing.lua
@@ -58,12 +58,12 @@ function addon:InitBlacksmithing()
 	-- Copper Chain Belt -- 2661
 	AddRecipe(2661, 35, 2851, Q.COMMON, V.ORIG, 35, 75, 95, 115)
 	self:AddRecipeFlags(2661, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(2661, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(2661, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Copper Chain Pants -- 2662
 	AddRecipe(2662, 1, 2852, Q.COMMON, V.ORIG, 1, 50, 70, 90)
 	self:AddRecipeFlags(2662, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(2662, 29924, 3174, 17245, 26564, 27034, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 1241, 2836, 15400, 26988, 4596, 3557, 33591, 33675, 5511, 16823, 28694, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2662, 3355, 3174, 29924, 16724, 26981, 6299, 2998, 26904, 17245, 19341, 26952, 33631, 28694, 3136, 4258, 514, 15400, 26988, 2836, 27034, 33609, 4596, 3557, 33591, 33675, 5511, 16823, 1241, 16669, 3478, 16583, 26564)

 	-- Copper Bracers -- 2663
 	AddRecipe(2663, 1, 2853, Q.COMMON, V.ORIG, 1, 20, 40, 60)
@@ -73,82 +73,82 @@ function addon:InitBlacksmithing()
 	-- Runed Copper Bracers -- 2664
 	AddRecipe(2664, 90, 2854, Q.COMMON, V.ORIG, 90, 115, 127, 140)
 	self:AddRecipeFlags(2664, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(2664, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2664, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Coarse Sharpening Stone -- 2665
 	AddRecipe(2665, 65, 2863, Q.COMMON, V.ORIG, 65, 65, 72, 80)
 	self:AddRecipeFlags(2665, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(2665, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(2665, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Runed Copper Belt -- 2666
 	AddRecipe(2666, 70, 2857, Q.COMMON, V.ORIG, 70, 110, 130, 150)
 	self:AddRecipeFlags(2666, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(2666, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(2666, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Runed Copper Breastplate -- 2667
 	AddRecipe(2667, 80, 2864, Q.UNCOMMON, V.ORIG, 80, 120, 140, 160)
 	self:AddRecipeFlags(2667, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(2667, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(2667, 2)

 	-- Rough Bronze Leggings -- 2668
 	AddRecipe(2668, 105, 2865, Q.COMMON, V.ORIG, 105, 145, 160, 175)
 	self:AddRecipeFlags(2668, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(2668, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2668, 3174, 29924, 3355, 16724, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 27034, 3136, 4258, 514, 1241, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 33591, 26981)

 	-- Rough Bronze Cuirass -- 2670
 	AddRecipe(2670, 105, 2866, Q.COMMON, V.ORIG, 105, 145, 160, 175)
 	self:AddRecipeFlags(2670, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(2670, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2670, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Patterned Bronze Bracers -- 2672
 	AddRecipe(2672, 120, 2868, Q.COMMON, V.ORIG, 120, 150, 165, 180)
 	self:AddRecipeFlags(2672, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(2672, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2672, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Silvered Bronze Breastplate -- 2673
 	AddRecipe(2673, 130, 2869, Q.UNCOMMON, V.ORIG, 130, 160, 175, 190)
 	self:AddRecipeFlags(2673, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(2673, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(2673, 2)

 	-- Heavy Sharpening Stone -- 2674
 	AddRecipe(2674, 125, 2871, Q.COMMON, V.ORIG, 125, 125, 132, 140)
 	self:AddRecipeFlags(2674, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(2674, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2674, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Shining Silver Breastplate -- 2675
 	AddRecipe(2675, 145, 2870, Q.COMMON, V.ORIG, 145, 175, 190, 205)
 	self:AddRecipeFlags(2675, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(2675, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2675, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Copper Mace -- 2737
 	AddRecipe(2737, 15, 2844, Q.COMMON, V.ORIG, 15, 55, 75, 95)
 	self:AddRecipeFlags(2737, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(2737, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(2737, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Copper Axe -- 2738
 	AddRecipe(2738, 20, 2845, Q.COMMON, V.ORIG, 20, 60, 80, 100)
 	self:AddRecipeFlags(2738, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(2738, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(2738, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Copper Shortsword -- 2739
 	AddRecipe(2739, 25, 2847, Q.COMMON, V.ORIG, 25, 65, 85, 105)
 	self:AddRecipeFlags(2739, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(2739, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(2739, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Bronze Mace -- 2740
 	AddRecipe(2740, 110, 2848, Q.COMMON, V.ORIG, 110, 140, 155, 170)
 	self:AddRecipeFlags(2740, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(2740, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2740, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Bronze Axe -- 2741
 	AddRecipe(2741, 115, 2849, Q.COMMON, V.ORIG, 115, 145, 160, 175)
 	self:AddRecipeFlags(2741, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(2741, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2741, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Bronze Shortsword -- 2742
 	AddRecipe(2742, 120, 2850, Q.COMMON, V.ORIG, 120, 150, 165, 180)
 	self:AddRecipeFlags(2742, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(2742, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(2742, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Rough Weightstone -- 3115
 	AddRecipe(3115, 1, 3239, Q.COMMON, V.ORIG, 1, 15, 35, 55)
@@ -158,117 +158,117 @@ function addon:InitBlacksmithing()
 	-- Coarse Weightstone -- 3116
 	AddRecipe(3116, 65, 3240, Q.COMMON, V.ORIG, 65, 65, 72, 80)
 	self:AddRecipeFlags(3116, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3116, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(3116, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Heavy Weightstone -- 3117
 	AddRecipe(3117, 125, 3241, Q.COMMON, V.ORIG, 125, 125, 132, 140)
 	self:AddRecipeFlags(3117, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3117, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3117, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Heavy Copper Broadsword -- 3292
 	AddRecipe(3292, 95, 3487, Q.COMMON, V.ORIG, 95, 135, 155, 175)
 	self:AddRecipeFlags(3292, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(3292, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3292, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Copper Battle Axe -- 3293
 	AddRecipe(3293, 35, 3488, Q.COMMON, V.ORIG, 35, 75, 95, 115)
 	self:AddRecipeFlags(3293, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TWO_HAND, F.AXE)
-	self:AddRecipeTrainer(3293, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(3293, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Thick War Axe -- 3294
 	AddRecipe(3294, 70, 3489, Q.COMMON, V.ORIG, 70, 110, 130, 150)
 	self:AddRecipeFlags(3294, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(3294, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(3294, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Deadly Bronze Poniard -- 3295
 	AddRecipe(3295, 125, 3490, Q.UNCOMMON, V.ORIG, 125, 155, 170, 195)
 	self:AddRecipeFlags(3295, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeAcquire(3295, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3295, 2)

 	-- Heavy Bronze Mace -- 3296
 	AddRecipe(3296, 130, 3491, Q.COMMON, V.ORIG, 130, 160, 175, 190)
 	self:AddRecipeFlags(3296, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(3296, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3296, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Mighty Iron Hammer -- 3297
 	AddRecipe(3297, 145, 3492, Q.UNCOMMON, V.ORIG, 145, 175, 190, 205)
 	self:AddRecipeFlags(3297, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeAcquire(3297, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3297, 2)

 	-- Copper Chain Boots -- 3319
 	AddRecipe(3319, 20, 3469, Q.COMMON, V.ORIG, 20, 60, 80, 100)
 	self:AddRecipeFlags(3319, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(3319, 29924, 3174, 17245, 26564, 27034, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 1241, 2836, 15400, 26988, 4596, 3557, 33591, 33675, 5511, 16823, 28694, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3319, 3355, 3174, 29924, 16724, 26981, 6299, 2998, 26904, 17245, 19341, 26952, 33631, 28694, 3136, 4258, 514, 15400, 26988, 2836, 27034, 33609, 4596, 3557, 33591, 33675, 5511, 16823, 1241, 16669, 3478, 16583, 26564)

 	-- Rough Grinding Stone -- 3320
 	AddRecipe(3320, 25, 3470, Q.COMMON, V.ORIG, 25, 45, 65, 85)
 	self:AddRecipeFlags(3320, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3320, 3174, 17245, 29924, 27034, 6299, 2998, 26904, 26981, 26564, 26952, 16583, 33631, 3136, 4258, 514, 33609, 1241, 2836, 15400, 26988, 4596, 3557, 33591, 33675, 5511, 16823, 28694, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3320, 3174, 29924, 3355, 16724, 6299, 2998, 26904, 17245, 26564, 26952, 33631, 1241, 3136, 4258, 514, 28694, 26988, 2836, 27034, 33609, 4596, 3557, 33591, 33675, 5511, 16823, 15400, 16669, 3478, 26981, 16583)

 	-- Copper Chain Vest -- 3321
 	AddRecipe(3321, 35, 3471, Q.UNCOMMON, V.ORIG, 35, 75, 95, 115)
 	self:AddRecipeFlags(3321, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3321, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3321, 2)

 	-- Runed Copper Gauntlets -- 3323
 	AddRecipe(3323, 40, 3472, Q.COMMON, V.ORIG, 40, 80, 100, 120)
 	self:AddRecipeFlags(3323, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(3323, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(3323, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Runed Copper Pants -- 3324
 	AddRecipe(3324, 45, 3473, Q.COMMON, V.ORIG, 45, 85, 105, 125)
 	self:AddRecipeFlags(3324, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(3324, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(3324, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Gemmed Copper Gauntlets -- 3325
 	AddRecipe(3325, 60, 3474, Q.UNCOMMON, V.ORIG, 60, 100, 120, 140)
 	self:AddRecipeFlags(3325, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.MAIL)
-	self:AddRecipeAcquire(3325, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3325, 2)

 	-- Coarse Grinding Stone -- 3326
 	AddRecipe(3326, 75, 3478, Q.COMMON, V.ORIG, 75, 75, 87, 100)
 	self:AddRecipeFlags(3326, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3326, 3174, 17245, 29924, 28694, 6299, 2998, 26904, 26981, 26564, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(3326, 3174, 29924, 3355, 1241, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 33591, 3136, 4258, 514, 16724, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 26988, 16669, 3478, 26981, 33631)

 	-- Rough Bronze Shoulders -- 3328
 	AddRecipe(3328, 110, 3480, Q.COMMON, V.ORIG, 110, 140, 155, 170)
 	self:AddRecipeFlags(3328, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(3328, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3328, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Silvered Bronze Shoulders -- 3330
 	AddRecipe(3330, 125, 3481, Q.UNCOMMON, V.ORIG, 125, 155, 170, 185)
 	self:AddRecipeFlags(3330, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3330, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3330, 2)

 	-- Silvered Bronze Boots -- 3331
 	AddRecipe(3331, 130, 3482, Q.COMMON, V.ORIG, 130, 160, 175, 190)
 	self:AddRecipeFlags(3331, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(3331, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3331, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Silvered Bronze Gauntlets -- 3333
 	AddRecipe(3333, 135, 3483, Q.COMMON, V.ORIG, 135, 165, 180, 195)
 	self:AddRecipeFlags(3333, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(3333, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3333, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Green Iron Boots -- 3334
 	AddRecipe(3334, 145, 3484, Q.UNCOMMON, V.ORIG, 145, 175, 190, 205)
 	self:AddRecipeFlags(3334, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3334, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3334, 2)

 	-- Green Iron Gauntlets -- 3336
 	AddRecipe(3336, 150, 3485, Q.UNCOMMON, V.ORIG, 150, 180, 195, 210)
 	self:AddRecipeFlags(3336, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3336, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3336, 2)

 	-- Heavy Grinding Stone -- 3337
 	AddRecipe(3337, 125, 3486, Q.COMMON, V.ORIG, 125, 125, 137, 150)
 	self:AddRecipeFlags(3337, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3337, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3337, 3174, 29924, 3355, 16724, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 27034, 3136, 4258, 514, 1241, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 33591, 26981)

 	-- Big Bronze Knife -- 3491
 	AddRecipe(3491, 105, 3848, Q.COMMON, V.ORIG, 105, 135, 150, 165)
 	self:AddRecipeFlags(3491, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeTrainer(3491, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(3491, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Hardened Iron Shortsword -- 3492
 	AddRecipe(3492, 160, 3849, Q.COMMON, V.ORIG, 160, 185, 197, 210)
@@ -278,7 +278,7 @@ function addon:InitBlacksmithing()
 	-- Jade Serpentblade -- 3493
 	AddRecipe(3493, 175, 3850, Q.UNCOMMON, V.ORIG, 175, 200, 212, 225)
 	self:AddRecipeFlags(3493, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeAcquire(3493, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3493, 2)

 	-- Solid Iron Maul -- 3494
 	AddRecipe(3494, 155, 3851, Q.COMMON, V.ORIG, 155, 180, 192, 205)
@@ -288,7 +288,7 @@ function addon:InitBlacksmithing()
 	-- Golden Iron Destroyer -- 3495
 	AddRecipe(3495, 170, 3852, Q.UNCOMMON, V.ORIG, 170, 195, 207, 220)
 	self:AddRecipeFlags(3495, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeAcquire(3495, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3495, 2)

 	-- Moonsteel Broadsword -- 3496
 	AddRecipe(3496, 180, 3853, Q.COMMON, V.ORIG, 180, 205, 217, 230)
@@ -298,7 +298,7 @@ function addon:InitBlacksmithing()
 	-- Frost Tiger Blade -- 3497
 	AddRecipe(3497, 200, 3854, Q.UNCOMMON, V.ORIG, 200, 210, 215, 220)
 	self:AddRecipeFlags(3497, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TWO_HAND, F.SWORD)
-	self:AddRecipeAcquire(3497, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3497, 2)

 	-- Massive Iron Axe -- 3498
 	AddRecipe(3498, 185, 3855, Q.COMMON, V.ORIG, 185, 210, 222, 235)
@@ -308,17 +308,17 @@ function addon:InitBlacksmithing()
 	-- Shadow Crescent Axe -- 3500
 	AddRecipe(3500, 200, 3856, Q.UNCOMMON, V.ORIG, 200, 225, 237, 250)
 	self:AddRecipeFlags(3500, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeAcquire(3500, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3500, 2)

 	-- Green Iron Bracers -- 3501
 	AddRecipe(3501, 165, 3835, Q.COMMON, V.ORIG, 165, 190, 202, 215)
 	self:AddRecipeFlags(3501, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(3501, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(3501, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 27034, 3136, 4258, 514, 1241, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 33591, 26981)

 	-- Green Iron Helm -- 3502
 	AddRecipe(3502, 170, 3836, Q.COMMON, V.ORIG, 170, 195, 207, 220)
 	self:AddRecipeFlags(3502, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(3502, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(3502, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Golden Scale Coif -- 3503
 	AddRecipe(3503, 190, 3837, Q.COMMON, V.ORIG, 190, 215, 227, 240)
@@ -328,172 +328,172 @@ function addon:InitBlacksmithing()
 	-- Green Iron Shoulders -- 3504
 	AddRecipe(3504, 160, 3840, Q.UNCOMMON, V.ORIG, 160, 185, 197, 210)
 	self:AddRecipeFlags(3504, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3504, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3504, 2)

 	-- Golden Scale Shoulders -- 3505
 	AddRecipe(3505, 175, 3841, Q.RARE, V.ORIG, 175, 200, 212, 225)
 	self:AddRecipeFlags(3505, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3505, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(3505, 3)

 	-- Green Iron Leggings -- 3506
 	AddRecipe(3506, 155, 3842, Q.COMMON, V.ORIG, 155, 180, 192, 205)
 	self:AddRecipeFlags(3506, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(3506, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(3506, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Golden Scale Leggings -- 3507
 	AddRecipe(3507, 170, 3843, Q.UNCOMMON, V.ORIG, 170, 195, 207, 220)
 	self:AddRecipeFlags(3507, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3507, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3507, 2)

 	-- Green Iron Hauberk -- 3508
 	AddRecipe(3508, 180, 3844, Q.COMMON, V.ORIG, 180, 205, 217, 230)
 	self:AddRecipeFlags(3508, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(3508, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(3508, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Golden Scale Cuirass -- 3511
 	AddRecipe(3511, 195, 3845, Q.UNCOMMON, V.ORIG, 195, 220, 232, 245)
 	self:AddRecipeFlags(3511, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3511, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3511, 2)

 	-- Polished Steel Boots -- 3513
 	AddRecipe(3513, 185, 3846, Q.UNCOMMON, V.ORIG, 185, 210, 222, 235)
 	self:AddRecipeFlags(3513, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.MAIL)
-	self:AddRecipeAcquire(3513, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3513, 2)

 	-- Golden Scale Boots -- 3515
 	AddRecipe(3515, 200, 3847, Q.RARE, V.ORIG, 200, 210, 215, 220)
 	self:AddRecipeFlags(3515, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(3515, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3515, 2)

 	-- Pearl-handled Dagger -- 6517
 	AddRecipe(6517, 110, 5540, Q.COMMON, V.ORIG, 110, 140, 155, 170)
 	self:AddRecipeFlags(6517, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeTrainer(6517, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(6517, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Iridescent Hammer -- 6518
 	AddRecipe(6518, 140, 5541, Q.UNCOMMON, V.ORIG, 140, 170, 185, 200)
 	self:AddRecipeFlags(6518, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeAcquire(6518, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(6518, 2)

 	-- Iron Shield Spike -- 7221
 	AddRecipe(7221, 150, 6042, Q.UNCOMMON, V.ORIG, 150, 180, 195, 210)
 	self:AddRecipeFlags(7221, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.SHIELD)
-	self:AddRecipeAcquire(7221, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7221, 2)

 	-- Iron Counterweight -- 7222
 	AddRecipe(7222, 165, 6043, Q.UNCOMMON, V.ORIG, 165, 190, 202, 215)
 	self:AddRecipeFlags(7222, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.AXE)
-	self:AddRecipeAcquire(7222, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7222, 2)

 	-- Golden Scale Bracers -- 7223
 	AddRecipe(7223, 185, 6040, Q.COMMON, V.ORIG, 185, 210, 222, 235)
 	self:AddRecipeFlags(7223, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK, F.MAIL)
-	self:AddRecipeTrainer(7223, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(7223, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Steel Weapon Chain -- 7224
 	AddRecipe(7224, 190, 6041, Q.UNCOMMON, V.ORIG, 190, 215, 227, 240)
 	self:AddRecipeFlags(7224, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(7224, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7224, 2)

 	-- Heavy Copper Maul -- 7408
 	AddRecipe(7408, 65, 6214, Q.COMMON, V.ORIG, 65, 105, 125, 145)
 	self:AddRecipeFlags(7408, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeTrainer(7408, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(7408, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Rough Bronze Boots -- 7817
 	AddRecipe(7817, 95, 6350, Q.COMMON, V.ORIG, 95, 125, 140, 155)
 	self:AddRecipeFlags(7817, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(7817, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(7817, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Silver Rod -- 7818
 	AddRecipe(7818, 100, 6338, Q.COMMON, V.ORIG, 100, 105, 107, 110)
 	self:AddRecipeFlags(7818, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(7818, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(7818, 3174, 29924, 3355, 16724, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 27034, 3136, 4258, 514, 1241, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 33591, 26981)

 	-- Ironforge Breastplate -- 8367
 	AddRecipe(8367, 100, 6731, Q.UNCOMMON, V.ORIG, 100, 140, 160, 180)
 	self:AddRecipeFlags(8367, F.ALLIANCE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(8367, A.QUEST, 1618)
+	self:AddRecipeQuest(8367, 1618)

 	-- Iron Buckle -- 8768
 	AddRecipe(8768, 150, 7071, Q.COMMON, V.ORIG, 150, 150, 152, 155)
 	self:AddRecipeFlags(8768, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(8768, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(8768, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Copper Dagger -- 8880
 	AddRecipe(8880, 30, 7166, Q.COMMON, V.ORIG, 30, 70, 90, 110)
 	self:AddRecipeFlags(8880, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeTrainer(8880, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(8880, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Barbaric Iron Shoulders -- 9811
 	AddRecipe(9811, 160, 7913, Q.UNCOMMON, V.ORIG, 160, 185, 197, 210)
 	self:AddRecipeFlags(9811, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(9811, A.QUEST, 2752)
+	self:AddRecipeQuest(9811, 2752)

 	-- Barbaric Iron Breastplate -- 9813
 	AddRecipe(9813, 160, 7914, Q.UNCOMMON, V.ORIG, 160, 185, 197, 210)
 	self:AddRecipeFlags(9813, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(9813, A.QUEST, 2751)
+	self:AddRecipeQuest(9813, 2751)

 	-- Barbaric Iron Helm -- 9814
 	AddRecipe(9814, 175, 7915, Q.UNCOMMON, V.ORIG, 175, 200, 212, 225)
 	self:AddRecipeFlags(9814, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(9814, A.QUEST, 2754)
+	self:AddRecipeQuest(9814, 2754)

 	-- Barbaric Iron Boots -- 9818
 	AddRecipe(9818, 180, 7916, Q.UNCOMMON, V.ORIG, 180, 205, 217, 230)
 	self:AddRecipeFlags(9818, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(9818, A.QUEST, 2753)
+	self:AddRecipeQuest(9818, 2753)

 	-- Barbaric Iron Gloves -- 9820
 	AddRecipe(9820, 185, 7917, Q.UNCOMMON, V.ORIG, 185, 210, 222, 235)
 	self:AddRecipeFlags(9820, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(9820, A.QUEST, 2755)
+	self:AddRecipeQuest(9820, 2755)

 	-- Steel Breastplate -- 9916
 	AddRecipe(9916, 200, 7963, Q.COMMON, V.ORIG, 200, 225, 237, 250)
 	self:AddRecipeFlags(9916, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(9916, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9916, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Solid Sharpening Stone -- 9918
 	AddRecipe(9918, 200, 7964, Q.COMMON, V.ORIG, 200, 200, 205, 210)
 	self:AddRecipeFlags(9918, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(9918, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33609, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9918, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 17245, 3136, 4258, 514, 1241, 28694, 2836, 27034, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 26981, 26564)

 	-- Solid Grinding Stone -- 9920
 	AddRecipe(9920, 200, 7966, Q.COMMON, V.ORIG, 200, 200, 205, 210)
 	self:AddRecipeFlags(9920, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(9920, 3174, 33591, 29924, 6299, 2998, 26904, 3557, 26564, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33609, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9920, 3174, 29924, 16724, 6299, 2998, 26904, 3355, 26564, 26952, 16583, 17245, 3136, 4258, 514, 26988, 1241, 2836, 27034, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 28694, 16669, 3478, 33591, 26981)

 	-- Solid Weightstone -- 9921
 	AddRecipe(9921, 200, 7965, Q.COMMON, V.ORIG, 200, 200, 205, 210)
 	self:AddRecipeFlags(9921, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(9921, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33609, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9921, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 17245, 3136, 4258, 514, 1241, 28694, 2836, 27034, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 26981, 26564)

 	-- Heavy Mithril Shoulder -- 9926
 	AddRecipe(9926, 205, 7918, Q.COMMON, V.ORIG, 205, 225, 235, 245)
 	self:AddRecipeFlags(9926, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(9926, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33609, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9926, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 17245, 3136, 4258, 514, 1241, 28694, 2836, 27034, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 26981, 26564)

 	-- Heavy Mithril Gauntlet -- 9928
 	AddRecipe(9928, 205, 7919, Q.COMMON, V.ORIG, 205, 225, 235, 245)
 	self:AddRecipeFlags(9928, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(9928, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33609, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9928, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 17245, 3136, 4258, 514, 1241, 28694, 2836, 27034, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 26981, 26564)

 	-- Mithril Scale Pants -- 9931
 	AddRecipe(9931, 210, 7920, Q.COMMON, V.ORIG, 210, 230, 240, 250)
 	self:AddRecipeFlags(9931, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(9931, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33609, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9931, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 17245, 3136, 4258, 514, 1241, 28694, 2836, 27034, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 26981, 26564)

 	-- Heavy Mithril Pants -- 9933
 	AddRecipe(9933, 210, 7921, Q.UNCOMMON, V.ORIG, 210, 230, 240, 250)
 	self:AddRecipeFlags(9933, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.PLATE)
-	self:AddRecipeAcquire(9933, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9933, 2)

 	-- Steel Plate Helm -- 9935
 	AddRecipe(9935, 215, 7922, Q.COMMON, V.ORIG, 215, 235, 245, 255)
 	self:AddRecipeFlags(9935, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(9935, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33609, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9935, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 17245, 3136, 4258, 514, 1241, 28694, 2836, 27034, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 26988, 16669, 3478, 26981, 26564)

 	-- Mithril Scale Bracers -- 9937
 	AddRecipe(9937, 215, 7924, Q.COMMON, V.ORIG, 215, 235, 245, 255)
@@ -503,122 +503,122 @@ function addon:InitBlacksmithing()
 	-- Mithril Shield Spike -- 9939
 	AddRecipe(9939, 215, 7967, Q.RARE, V.ORIG, 215, 235, 245, 255)
 	self:AddRecipeFlags(9939, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.SHIELD)
-	self:AddRecipeAcquire(9939, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(9939, 3)

 	-- Ornate Mithril Pants -- 9945
 	AddRecipe(9945, 220, 7926, Q.UNCOMMON, V.ORIG, 220, 240, 250, 260)
 	self:AddRecipeFlags(9945, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(9945, A.QUEST, 2761)
+	self:AddRecipeQuest(9945, 2761)

 	-- Ornate Mithril Gloves -- 9950
 	AddRecipe(9950, 220, 7927, Q.UNCOMMON, V.ORIG, 220, 240, 250, 260)
 	self:AddRecipeFlags(9950, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeAcquire(9950, A.QUEST, 2762)
+	self:AddRecipeQuest(9950, 2762)

 	-- Ornate Mithril Shoulder -- 9952
 	AddRecipe(9952, 225, 7928, Q.UNCOMMON, V.ORIG, 225, 245, 255, 265)
 	self:AddRecipeFlags(9952, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(9952, A.QUEST, 2763)
+	self:AddRecipeQuest(9952, 2763)

 	-- Truesilver Gauntlets -- 9954
 	AddRecipe(9954, 225, 7938, Q.COMMON, V.ORIG, 225, 245, 255, 265)
 	self:AddRecipeFlags(9954, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(9954, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(9954, 11177, 29506, 20125, 7230, 5164)

 	-- Orcish War Leggings -- 9957
 	AddRecipe(9957, 250, 7929, Q.UNCOMMON, V.ORIG, 250, 250, 260, 270)
 	self:AddRecipeFlags(9957, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(9957, A.QUEST, 2756)
+	self:AddRecipeQuest(9957, 2756)

 	-- Heavy Mithril Breastplate -- 9959
 	AddRecipe(9959, 230, 7930, Q.COMMON, V.ORIG, 230, 250, 260, 270)
 	self:AddRecipeFlags(9959, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(9959, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9959, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 1241, 3136, 4258, 514, 33609, 28694, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 33631, 17245, 3478, 26981, 26564)

 	-- Mithril Coif -- 9961
 	AddRecipe(9961, 230, 7931, Q.COMMON, V.ORIG, 230, 250, 260, 270)
 	self:AddRecipeFlags(9961, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(9961, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9961, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 1241, 3136, 4258, 514, 33609, 28694, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 33631, 17245, 3478, 26981, 26564)

 	-- Mithril Spurs -- 9964
 	AddRecipe(9964, 235, 7969, Q.UNCOMMON, V.ORIG, 235, 255, 265, 275)
 	self:AddRecipeFlags(9964, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(9964, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9964, 2)

 	-- Mithril Scale Shoulders -- 9966
 	AddRecipe(9966, 235, 7932, Q.RARE, V.ORIG, 235, 255, 265, 275)
 	self:AddRecipeFlags(9966, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(9966, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(9966, 3)

 	-- Heavy Mithril Boots -- 9968
 	AddRecipe(9968, 235, 7933, Q.COMMON, V.ORIG, 235, 255, 265, 275)
 	self:AddRecipeFlags(9968, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(9968, 3174, 17245, 29924, 26981, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 27034, 3136, 4258, 514, 33631, 33609, 2836, 15400, 26988, 4596, 3557, 33591, 33675, 5511, 16823, 28694, 1241, 3478, 16724, 3355)
+	self:AddRecipeTrainer(9968, 3174, 29924, 3355, 16724, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 1241, 3136, 4258, 514, 28694, 26988, 2836, 27034, 33609, 4596, 3557, 33591, 33675, 5511, 16823, 15400, 17245, 3478, 26981, 33631)

 	-- Heavy Mithril Helm -- 9970
 	AddRecipe(9970, 245, 7934, Q.UNCOMMON, V.ORIG, 245, 255, 265, 275)
 	self:AddRecipeFlags(9970, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(9970, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9970, 2)

 	-- Ornate Mithril Breastplate -- 9972
 	AddRecipe(9972, 260, 7935, Q.UNCOMMON, V.ORIG, 260, 260, 270, 280)
 	self:AddRecipeFlags(9972, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(9972, A.QUEST, 2773)
+	self:AddRecipeQuest(9972, 2773)

 	-- Truesilver Breastplate -- 9974
 	AddRecipe(9974, 245, 7939, Q.COMMON, V.ORIG, 245, 265, 275, 285)
 	self:AddRecipeFlags(9974, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(9974, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(9974, 11177, 29506, 20125, 7230, 5164)

 	-- Ornate Mithril Boots -- 9979
 	AddRecipe(9979, 265, 7936, Q.UNCOMMON, V.ORIG, 265, 265, 275, 285)
 	self:AddRecipeFlags(9979, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(9979, A.QUEST, 2772)
+	self:AddRecipeQuest(9979, 2772)

 	-- Ornate Mithril Helm -- 9980
 	AddRecipe(9980, 265, 7937, Q.UNCOMMON, V.ORIG, 265, 265, 275, 285)
 	self:AddRecipeFlags(9980, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(9980, A.QUEST, 2771)
+	self:AddRecipeQuest(9980, 2771)

 	-- Copper Claymore -- 9983
 	AddRecipe(9983, 30, 7955, Q.COMMON, V.ORIG, 30, 70, 90, 110)
 	self:AddRecipeFlags(9983, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(9983, 29924, 3174, 17245, 26564, 28694, 6299, 2998, 26904, 26981, 19341, 26952, 16583, 33631, 3136, 4258, 514, 33609, 33591, 2836, 15400, 26988, 4596, 3557, 27034, 33675, 5511, 16823, 16724, 16669, 3478, 1241, 3355)
+	self:AddRecipeTrainer(9983, 3355, 3174, 29924, 1241, 26981, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 16724, 3136, 4258, 514, 26988, 3557, 2836, 15400, 33609, 4596, 28694, 27034, 33675, 5511, 16823, 33591, 16669, 3478, 33631, 19341)

 	-- Bronze Warhammer -- 9985
 	AddRecipe(9985, 125, 7956, Q.COMMON, V.ORIG, 125, 155, 170, 185)
 	self:AddRecipeFlags(9985, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeTrainer(9985, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(9985, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Bronze Greatsword -- 9986
 	AddRecipe(9986, 130, 7957, Q.COMMON, V.ORIG, 130, 160, 175, 190)
 	self:AddRecipeFlags(9986, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(9986, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(9986, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Bronze Battle Axe -- 9987
 	AddRecipe(9987, 135, 7958, Q.COMMON, V.ORIG, 135, 165, 180, 195)
 	self:AddRecipeFlags(9987, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeTrainer(9987, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(9987, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Heavy Mithril Axe -- 9993
 	AddRecipe(9993, 210, 7941, Q.COMMON, V.ORIG, 210, 235, 247, 260)
 	self:AddRecipeFlags(9993, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(9993, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(9993, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Blue Glittering Axe -- 9995
 	AddRecipe(9995, 220, 7942, Q.UNCOMMON, V.ORIG, 220, 245, 257, 270)
 	self:AddRecipeFlags(9995, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeAcquire(9995, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9995, 2)

 	-- Wicked Mithril Blade -- 9997
 	AddRecipe(9997, 225, 7943, Q.UNCOMMON, V.ORIG, 225, 250, 262, 275)
 	self:AddRecipeFlags(9997, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeAcquire(9997, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9997, 2)

 	-- Big Black Mace -- 10001
 	AddRecipe(10001, 230, 7945, Q.COMMON, V.ORIG, 230, 255, 267, 280)
 	self:AddRecipeFlags(10001, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(10001, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(10001, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 1241, 3136, 4258, 514, 33609, 28694, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 33631, 17245, 3478, 26981, 26564)

 	-- The Shatterer -- 10003
 	AddRecipe(10003, 235, 7954, Q.COMMON, V.ORIG, 235, 260, 272, 285)
@@ -628,7 +628,7 @@ function addon:InitBlacksmithing()
 	-- Dazzling Mithril Rapier -- 10005
 	AddRecipe(10005, 240, 7944, Q.UNCOMMON, V.ORIG, 240, 265, 277, 290)
 	self:AddRecipeFlags(10005, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeAcquire(10005, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(10005, 2)

 	-- Phantom Blade -- 10007
 	AddRecipe(10007, 245, 7961, Q.COMMON, V.ORIG, 245, 270, 282, 295)
@@ -638,12 +638,12 @@ function addon:InitBlacksmithing()
 	-- Runed Mithril Hammer -- 10009
 	AddRecipe(10009, 245, 7946, Q.RARE, V.ORIG, 245, 270, 282, 295)
 	self:AddRecipeFlags(10009, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeAcquire(10009, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(10009, 3)

 	-- Blight -- 10011
 	AddRecipe(10011, 250, 7959, Q.COMMON, V.ORIG, 250, 275, 287, 300)
 	self:AddRecipeFlags(10011, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TWO_HAND, F.POLEARM)
-	self:AddRecipeTrainer(10011, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(10011, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Ebon Shiv -- 10013
 	AddRecipe(10013, 255, 7947, Q.COMMON, V.ORIG, 255, 280, 292, 305)
@@ -653,7 +653,7 @@ function addon:InitBlacksmithing()
 	-- Truesilver Champion -- 10015
 	AddRecipe(10015, 260, 7960, Q.COMMON, V.ORIG, 260, 285, 297, 310)
 	self:AddRecipeFlags(10015, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(10015, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(10015, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Inlaid Mithril Cylinder -- 11454
 	AddRecipe(11454, 200, 9060, Q.COMMON, V.ORIG, 200, 225, 237, 250)
@@ -663,12 +663,12 @@ function addon:InitBlacksmithing()
 	-- Golden Scale Gauntlets -- 11643
 	AddRecipe(11643, 205, 9366, Q.UNCOMMON, V.ORIG, 205, 225, 235, 245)
 	self:AddRecipeFlags(11643, F.ALLIANCE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(11643, A.QUEST, 2758)
+	self:AddRecipeQuest(11643, 2758)

 	-- Silvered Bronze Leggings -- 12259
 	AddRecipe(12259, 155, 10423, Q.UNCOMMON, V.ORIG, 155, 180, 192, 205)
 	self:AddRecipeFlags(12259, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(12259, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12259, 2)

 	-- Rough Copper Vest -- 12260
 	AddRecipe(12260, 1, 10421, Q.COMMON, V.ORIG, 1, 15, 35, 55)
@@ -678,12 +678,12 @@ function addon:InitBlacksmithing()
 	-- Golden Rod -- 14379
 	AddRecipe(14379, 150, 11128, Q.COMMON, V.ORIG, 150, 155, 157, 160)
 	self:AddRecipeFlags(14379, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(14379, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(14379, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Truesilver Rod -- 14380
 	AddRecipe(14380, 200, 11144, Q.COMMON, V.ORIG, 200, 205, 207, 210)
 	self:AddRecipeFlags(14380, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(14380, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(14380, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Dark Iron Pulverizer -- 15292
 	AddRecipe(15292, 265, 11608, Q.RARE, V.ORIG, 265, 285, 295, 305)
@@ -713,144 +713,144 @@ function addon:InitBlacksmithing()
 	-- Glinting Steel Dagger -- 15972
 	AddRecipe(15972, 180, 12259, Q.COMMON, V.ORIG, 180, 205, 217, 230)
 	self:AddRecipeFlags(15972, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeTrainer(15972, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(15972, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Searing Golden Blade -- 15973
 	AddRecipe(15973, 190, 12260, Q.UNCOMMON, V.ORIG, 190, 215, 227, 240)
 	self:AddRecipeFlags(15973, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeAcquire(15973, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(15973, 2)

 	-- Dense Grinding Stone -- 16639
 	AddRecipe(16639, 250, 12644, Q.COMMON, V.ORIG, 250, 255, 257, 260)
 	self:AddRecipeFlags(16639, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(16639, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(16639, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 1241, 3136, 4258, 514, 33609, 28694, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 33631, 17245, 3478, 26981, 26564)

 	-- Dense Weightstone -- 16640
 	AddRecipe(16640, 250, 12643, Q.COMMON, V.ORIG, 250, 255, 257, 260)
 	self:AddRecipeFlags(16640, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(16640, 3174, 33591, 29924, 6299, 2998, 26904, 3557, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(16640, 3174, 29924, 16724, 6299, 2998, 26904, 3355, 19341, 26952, 16583, 33591, 3136, 4258, 514, 1241, 33609, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 28694, 17245, 3478, 33631, 26981)

 	-- Dense Sharpening Stone -- 16641
 	AddRecipe(16641, 250, 12404, Q.COMMON, V.ORIG, 250, 255, 257, 260)
 	self:AddRecipeFlags(16641, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(16641, 3174, 33591, 29924, 6299, 2998, 26904, 3557, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(16641, 3174, 29924, 16724, 6299, 2998, 26904, 3355, 19341, 26952, 16583, 33591, 3136, 4258, 514, 1241, 33609, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 28694, 17245, 3478, 33631, 26981)

 	-- Thorium Armor -- 16642
 	AddRecipe(16642, 250, 12405, Q.UNCOMMON, V.ORIG, 250, 270, 280, 290)
 	self:AddRecipeFlags(16642, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(16642, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 1241, 3478, 16724, 3355)
-	self:AddRecipeAcquire(16642, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(16642, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 3355, 3478, 16724, 1241)
+	self:AddRecipeWorldDrop(16642, 2)

 	-- Thorium Belt -- 16643
 	AddRecipe(16643, 250, 12406, Q.UNCOMMON, V.ORIG, 250, 270, 280, 290)
 	self:AddRecipeFlags(16643, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(16643, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 1241, 3478, 16724, 3355)
-	self:AddRecipeAcquire(16643, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(16643, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 3355, 3478, 16724, 1241)
+	self:AddRecipeWorldDrop(16643, 2)

 	-- Thorium Bracers -- 16644
 	AddRecipe(16644, 255, 12408, Q.UNCOMMON, V.ORIG, 255, 275, 285, 295)
 	self:AddRecipeFlags(16644, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(16644, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 1241, 3478, 16724, 3355)
-	self:AddRecipeAcquire(16644, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(16644, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 3355, 3478, 16724, 1241)
+	self:AddRecipeWorldDrop(16644, 2)

 	-- Radiant Belt -- 16645
 	AddRecipe(16645, 260, 12416, Q.UNCOMMON, V.ORIG, 260, 280, 290, 300)
 	self:AddRecipeFlags(16645, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.MAIL)
-	self:AddRecipeAcquire(16645, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16645, 2)

 	-- Imperial Plate Shoulders -- 16646
 	AddRecipe(16646, 265, 12428, Q.UNCOMMON, V.ORIG, 265, 285, 295, 305)
 	self:AddRecipeFlags(16646, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(16646, A.QUEST, 7659)
+	self:AddRecipeQuest(16646, 7659)

 	-- Imperial Plate Belt -- 16647
 	AddRecipe(16647, 265, 12424, Q.UNCOMMON, V.ORIG, 265, 285, 295, 305)
 	self:AddRecipeFlags(16647, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(16647, A.QUEST, 7653)
+	self:AddRecipeQuest(16647, 7653)

 	-- Radiant Breastplate -- 16648
 	AddRecipe(16648, 270, 12415, Q.UNCOMMON, V.ORIG, 270, 290, 300, 310)
 	self:AddRecipeFlags(16648, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.MAIL)
-	self:AddRecipeAcquire(16648, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16648, 2)

 	-- Imperial Plate Bracers -- 16649
 	AddRecipe(16649, 270, 12425, Q.UNCOMMON, V.ORIG, 270, 290, 300, 310)
 	self:AddRecipeFlags(16649, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(16649, A.QUEST, 7655)
+	self:AddRecipeQuest(16649, 7655)

 	-- Wildthorn Mail -- 16650
 	AddRecipe(16650, 270, 12624, Q.UNCOMMON, V.ORIG, 270, 290, 300, 310)
 	self:AddRecipeFlags(16650, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.MAIL)
-	self:AddRecipeAcquire(16650, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16650, 2)

 	-- Thorium Shield Spike -- 16651
 	AddRecipe(16651, 275, 12645, Q.UNCOMMON, V.ORIG, 275, 295, 305, 315)
 	self:AddRecipeFlags(16651, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK)
-	self:AddRecipeAcquire(16651, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16651, 2)

 	-- Thorium Boots -- 16652
 	AddRecipe(16652, 280, 12409, Q.UNCOMMON, V.ORIG, 280, 300, 310, 320)
 	self:AddRecipeFlags(16652, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(16652, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 1241, 3478, 16724, 3355)
-	self:AddRecipeAcquire(16652, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(16652, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 3355, 3478, 16724, 1241)
+	self:AddRecipeWorldDrop(16652, 2)

 	-- Thorium Helm -- 16653
 	AddRecipe(16653, 280, 12410, Q.UNCOMMON, V.ORIG, 280, 300, 310, 320)
 	self:AddRecipeFlags(16653, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(16653, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 1241, 3478, 16724, 3355)
-	self:AddRecipeAcquire(16653, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(16653, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 3355, 3478, 16724, 1241)
+	self:AddRecipeWorldDrop(16653, 2)

 	-- Radiant Gloves -- 16654
 	AddRecipe(16654, 285, 12418, Q.UNCOMMON, V.ORIG, 285, 305, 315, 325)
 	self:AddRecipeFlags(16654, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(16654, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16654, 2)

 	-- Fiery Plate Gauntlets -- 16655
 	AddRecipe(16655, 290, 12631, Q.RARE, V.ORIG, 290, 310, 320, 330)
 	self:AddRecipeFlags(16655, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeAcquire(16655, A.QUEST, 5124)
+	self:AddRecipeQuest(16655, 5124)

 	-- Radiant Boots -- 16656
 	AddRecipe(16656, 290, 12419, Q.UNCOMMON, V.ORIG, 290, 310, 320, 330)
 	self:AddRecipeFlags(16656, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(16656, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16656, 2)

 	-- Imperial Plate Boots -- 16657
 	AddRecipe(16657, 295, 12426, Q.UNCOMMON, V.ORIG, 295, 315, 325, 335)
 	self:AddRecipeFlags(16657, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(16657, A.QUEST, 7654)
+	self:AddRecipeQuest(16657, 7654)

 	-- Imperial Plate Helm -- 16658
 	AddRecipe(16658, 295, 12427, Q.UNCOMMON, V.ORIG, 295, 315, 325, 335)
 	self:AddRecipeFlags(16658, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(16658, A.QUEST, 7657)
+	self:AddRecipeQuest(16658, 7657)

 	-- Radiant Circlet -- 16659
 	AddRecipe(16659, 295, 12417, Q.UNCOMMON, V.ORIG, 295, 315, 325, 335)
 	self:AddRecipeFlags(16659, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(16659, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16659, 2)

 	-- Dawnbringer Shoulders -- 16660
 	AddRecipe(16660, 290, 12625, Q.RARE, V.ORIG, 290, 310, 320, 330)
 	self:AddRecipeFlags(16660, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeAcquire(16660, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16660, 2)

 	-- Storm Gauntlets -- 16661
 	AddRecipe(16661, 295, 12632, Q.RARE, V.ORIG, 295, 315, 325, 335)
 	self:AddRecipeFlags(16661, F.ALLIANCE, F.HORDE, F.VENDOR, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.MAIL)
 	self:AddRecipeVendor(16661, 11278)
-	self:AddRecipeAcquire(16661, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16661, 2)

 	-- Thorium Leggings -- 16662
 	AddRecipe(16662, 300, 12414, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16662, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(16662, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 1241, 3478, 16724, 3355)
-	self:AddRecipeAcquire(16662, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(16662, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 3355, 3478, 16724, 1241)
+	self:AddRecipeWorldDrop(16662, 2)

 	-- Imperial Plate Chest -- 16663
 	AddRecipe(16663, 300, 12422, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16663, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(16663, A.QUEST, 7656)
+	self:AddRecipeQuest(16663, 7656)

 	-- Runic Plate Shoulders -- 16664
 	AddRecipe(16664, 300, 12610, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
@@ -865,17 +865,17 @@ function addon:InitBlacksmithing()
 	-- Demon Forged Breastplate -- 16667
 	AddRecipe(16667, 285, 12628, Q.RARE, V.ORIG, 285, 305, 315, 325)
 	self:AddRecipeFlags(16667, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeAcquire(16667, A.QUEST, 5127)
+	self:AddRecipeQuest(16667, 5127)

 	-- Whitesoul Helm -- 16724
 	AddRecipe(16724, 300, 12633, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16724, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeAcquire(16724, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16724, 2)

 	-- Radiant Leggings -- 16725
 	AddRecipe(16725, 300, 12420, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16725, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(16725, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16725, 2)

 	-- Runic Plate Helm -- 16726
 	AddRecipe(16726, 300, 12612, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
@@ -885,17 +885,17 @@ function addon:InitBlacksmithing()
 	-- Helm of the Great Chief -- 16728
 	AddRecipe(16728, 300, 12636, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16728, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.MAIL)
-	self:AddRecipeAcquire(16728, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16728, 2)

 	-- Lionheart Helm -- 16729
 	AddRecipe(16729, 300, 12640, Q.EPIC, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16729, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(16729, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16729, 2)

 	-- Imperial Plate Leggings -- 16730
 	AddRecipe(16730, 300, 12429, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16730, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(16730, A.QUEST, 7658)
+	self:AddRecipeQuest(16730, 7658)

 	-- Runic Breastplate -- 16731
 	AddRecipe(16731, 300, 12613, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
@@ -910,54 +910,54 @@ function addon:InitBlacksmithing()
 	-- Stronghold Gauntlets -- 16741
 	AddRecipe(16741, 300, 12639, Q.EPIC, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16741, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(16741, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16741, 2)

 	-- Enchanted Thorium Helm -- 16742
 	AddRecipe(16742, 300, 12620, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16742, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(16742, A.QUEST, 7651)
+	self:AddRecipeQuest(16742, 7651)

 	-- Enchanted Thorium Leggings -- 16744
 	AddRecipe(16744, 300, 12619, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16744, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(16744, A.QUEST, 7650)
+	self:AddRecipeQuest(16744, 7650)

 	-- Enchanted Thorium Breastplate -- 16745
 	AddRecipe(16745, 300, 12618, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16745, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(16745, A.QUEST, 7649)
+	self:AddRecipeQuest(16745, 7649)

 	-- Invulnerable Mail -- 16746
 	AddRecipe(16746, 300, 12641, Q.EPIC, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(16746, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.MAIL)
-	self:AddRecipeAcquire(16746, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(16746, 2)

 	-- Ornate Thorium Handaxe -- 16969
 	AddRecipe(16969, 275, 12773, Q.UNCOMMON, V.ORIG, 275, 300, 312, 325)
 	self:AddRecipeFlags(16969, F.ALLIANCE, F.HORDE, F.TRAINER, F.VENDOR, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(16969, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 1241, 3478, 16724, 3355)
+	self:AddRecipeTrainer(16969, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 3355, 3478, 16724, 1241)
 	self:AddRecipeVendor(16969, 11278)

 	-- Dawn's Edge -- 16970
 	AddRecipe(16970, 275, 12774, Q.RARE, V.ORIG, 275, 300, 312, 325)
 	self:AddRecipeFlags(16970, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.ONE_HAND, F.AXE)
-	self:AddRecipeAcquire(16970, A.QUEST, 5306)
+	self:AddRecipeQuest(16970, 5306)

 	-- Huge Thorium Battleaxe -- 16971
 	AddRecipe(16971, 280, 12775, Q.COMMON, V.ORIG, 280, 305, 317, 330)
 	self:AddRecipeFlags(16971, F.ALLIANCE, F.HORDE, F.TRAINER, F.VENDOR, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeTrainer(16971, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 1241, 3478, 16724, 3355)
+	self:AddRecipeTrainer(16971, 3174, 17245, 6299, 2998, 33631, 3136, 4258, 514, 2836, 15400, 33609, 4596, 3557, 33675, 5511, 16823, 3355, 3478, 16724, 1241)
 	self:AddRecipeVendor(16971, 11278)

 	-- Enchanted Battlehammer -- 16973
 	AddRecipe(16973, 280, 12776, Q.UNCOMMON, V.ORIG, 280, 305, 317, 330)
 	self:AddRecipeFlags(16973, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.TANK, F.TWO_HAND, F.MACE)
-	self:AddRecipeAcquire(16973, A.QUEST, 5305)
+	self:AddRecipeQuest(16973, 5305)

 	-- Blazing Rapier -- 16978
 	AddRecipe(16978, 280, 12777, Q.UNCOMMON, V.ORIG, 280, 305, 317, 330)
 	self:AddRecipeFlags(16978, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.ONE_HAND, F.SWORD)
-	self:AddRecipeAcquire(16978, A.QUEST, 5307)
+	self:AddRecipeQuest(16978, 5307)

 	-- Serenity -- 16983
 	AddRecipe(16983, 285, 12781, Q.UNCOMMON, V.ORIG, 285, 310, 322, 335)
@@ -1012,27 +1012,27 @@ function addon:InitBlacksmithing()
 	-- Silver Skeleton Key -- 19666
 	AddRecipe(19666, 100, 15869, Q.COMMON, V.ORIG, 100, 100, 110, 120)
 	self:AddRecipeFlags(19666, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(19666, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(19666, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Golden Skeleton Key -- 19667
 	AddRecipe(19667, 150, 15870, Q.COMMON, V.ORIG, 150, 150, 160, 170)
 	self:AddRecipeFlags(19667, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(19667, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(19667, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Truesilver Skeleton Key -- 19668
 	AddRecipe(19668, 200, 15871, Q.COMMON, V.ORIG, 200, 200, 210, 220)
 	self:AddRecipeFlags(19668, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(19668, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(19668, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Arcanite Skeleton Key -- 19669
 	AddRecipe(19669, 275, 15872, Q.COMMON, V.ORIG, 275, 275, 280, 285)
 	self:AddRecipeFlags(19669, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(19669, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(19669, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 1241, 3136, 4258, 514, 33609, 28694, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 33631, 17245, 3478, 26981, 26564)

 	-- Arcanite Rod -- 20201
 	AddRecipe(20201, 275, 16206, Q.COMMON, V.ORIG, 275, 275, 280, 285)
 	self:AddRecipeFlags(20201, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(20201, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(20201, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 1241, 3136, 4258, 514, 33609, 28694, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 33631, 17245, 3478, 26981, 26564)

 	-- Fiery Chain Girdle -- 20872
 	AddRecipe(20872, 295, 16989, Q.RARE, V.ORIG, 295, 315, 325, 335)
@@ -1067,7 +1067,7 @@ function addon:InitBlacksmithing()
 	-- Sulfuron Hammer -- 21161
 	AddRecipe(21161, 300, 17193, Q.EPIC, V.ORIG, 300, 325, 337, 350)
 	self:AddRecipeFlags(21161, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.TWO_HAND, F.MACE)
-	self:AddRecipeAcquire(21161, A.QUEST, 7604)
+	self:AddRecipeQuest(21161, 7604)

 	-- Edge of Winter -- 21913
 	AddRecipe(21913, 190, 17704, Q.UNCOMMON, V.ORIG, 190, 215, 227, 240)
@@ -1172,17 +1172,17 @@ function addon:InitBlacksmithing()
 	-- Darkrune Gauntlets -- 24912
 	AddRecipe(24912, 300, 20549, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(24912, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(24912, A.QUEST, 8323)
+	self:AddRecipeQuest(24912, 8323)

 	-- Darkrune Helm -- 24913
 	AddRecipe(24913, 300, 20551, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(24913, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.PLATE)
-	self:AddRecipeAcquire(24913, A.QUEST, 8323)
+	self:AddRecipeQuest(24913, 8323)

 	-- Darkrune Breastplate -- 24914
 	AddRecipe(24914, 300, 20550, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(24914, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(24914, A.QUEST, 8323)
+	self:AddRecipeQuest(24914, 8323)

 	-- Heavy Obsidian Belt -- 27585
 	AddRecipe(27585, 300, 22197, Q.COMMON, V.ORIG, 300, 320, 330, 340)
@@ -1217,17 +1217,17 @@ function addon:InitBlacksmithing()
 	-- Titanic Leggings -- 27829
 	AddRecipe(27829, 300, 22385, Q.EPIC, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(27829, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(27829, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(27829, 2)

 	-- Persuader -- 27830
 	AddRecipe(27830, 300, 22384, Q.EPIC, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(27830, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.ONE_HAND, F.MACE)
-	self:AddRecipeAcquire(27830, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(27830, 2)

 	-- Sageblade -- 27832
 	AddRecipe(27832, 300, 22383, Q.EPIC, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(27832, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CASTER, F.ONE_HAND, F.SWORD)
-	self:AddRecipeAcquire(27832, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(27832, 2)

 	-- Icebane Breastplate -- 28242
 	AddRecipe(28242, 300, 22669, Q.EPIC, V.ORIG, 300, 320, 330, 340)
@@ -1265,62 +1265,62 @@ function addon:InitBlacksmithing()
 	-- Fel Iron Plate Gloves -- 29545
 	AddRecipe(29545, 300, 23482, Q.COMMON, V.TBC, 300, 310, 320, 330)
 	self:AddRecipeFlags(29545, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(29545, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29545, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Plate Belt -- 29547
 	AddRecipe(29547, 305, 23484, Q.COMMON, V.TBC, 305, 315, 325, 335)
 	self:AddRecipeFlags(29547, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(29547, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29547, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Plate Boots -- 29548
 	AddRecipe(29548, 315, 23487, Q.COMMON, V.TBC, 315, 325, 335, 345)
 	self:AddRecipeFlags(29548, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(29548, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29548, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Plate Pants -- 29549
 	AddRecipe(29549, 315, 23488, Q.COMMON, V.TBC, 315, 325, 335, 345)
 	self:AddRecipeFlags(29549, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(29549, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29549, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Breastplate -- 29550
 	AddRecipe(29550, 325, 23489, Q.COMMON, V.TBC, 325, 335, 345, 355)
 	self:AddRecipeFlags(29550, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(29550, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29550, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Chain Coif -- 29551
 	AddRecipe(29551, 300, 23493, Q.COMMON, V.TBC, 300, 320, 330, 340)
 	self:AddRecipeFlags(29551, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(29551, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29551, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Chain Gloves -- 29552
 	AddRecipe(29552, 310, 23491, Q.COMMON, V.TBC, 310, 320, 330, 340)
 	self:AddRecipeFlags(29552, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(29552, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29552, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Chain Bracers -- 29553
 	AddRecipe(29553, 315, 23494, Q.COMMON, V.TBC, 315, 325, 335, 345)
 	self:AddRecipeFlags(29553, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(29553, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29553, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Chain Tunic -- 29556
 	AddRecipe(29556, 320, 23490, Q.COMMON, V.TBC, 320, 330, 340, 350)
 	self:AddRecipeFlags(29556, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(29556, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29556, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Hatchet -- 29557
 	AddRecipe(29557, 310, 23497, Q.COMMON, V.TBC, 310, 320, 330, 340)
 	self:AddRecipeFlags(29557, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(29557, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29557, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Hammer -- 29558
 	AddRecipe(29558, 315, 23498, Q.COMMON, V.TBC, 315, 325, 335, 345)
 	self:AddRecipeFlags(29558, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(29558, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29558, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Fel Iron Greatsword -- 29565
 	AddRecipe(29565, 320, 23499, Q.COMMON, V.TBC, 320, 330, 340, 350)
 	self:AddRecipeFlags(29565, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(29565, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29565, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Adamantite Maul -- 29566
 	AddRecipe(29566, 325, 23502, Q.COMMON, V.TBC, 325, 335, 345, 355)
@@ -1415,7 +1415,7 @@ function addon:InitBlacksmithing()
 	-- Gauntlets of the Iron Tower -- 29622
 	AddRecipe(29622, 365, 23532, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29622, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(29622, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29622, 4)

 	-- Khorium Belt -- 29628
 	AddRecipe(29628, 360, 23524, Q.RARE, V.TBC, 360, 370, 380, 390)
@@ -1460,7 +1460,7 @@ function addon:InitBlacksmithing()
 	-- Fel Sharpening Stone -- 29654
 	AddRecipe(29654, 300, 23528, Q.COMMON, V.TBC, 300, 300, 305, 310)
 	self:AddRecipeFlags(29654, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(29654, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(29654, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Adamantite Sharpening Stone -- 29656
 	AddRecipe(29656, 350, 23529, Q.COMMON, V.TBC, 350, 350, 355, 360)
@@ -1476,87 +1476,87 @@ function addon:InitBlacksmithing()
 	-- Felfury Gauntlets -- 29658
 	AddRecipe(29658, 365, 23531, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29658, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(29658, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(29658, 2)

 	-- Steelgrip Gauntlets -- 29662
 	AddRecipe(29662, 365, 23533, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29662, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(29662, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29662, 4)

 	-- Storm Helm -- 29663
 	AddRecipe(29663, 365, 23534, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29663, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(29663, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29663, 4)

 	-- Helm of the Stalwart Defender -- 29664
 	AddRecipe(29664, 365, 23535, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29664, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(29664, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29664, 4)

 	-- Oathkeeper's Helm -- 29668
 	AddRecipe(29668, 365, 23536, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29668, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(29668, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29668, 4)

 	-- Black Felsteel Bracers -- 29669
 	AddRecipe(29669, 365, 23537, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29669, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.PLATE)
-	self:AddRecipeAcquire(29669, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29669, 4)

 	-- Bracers of the Green Fortress -- 29671
 	AddRecipe(29671, 365, 23538, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29671, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.PLATE)
-	self:AddRecipeAcquire(29671, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29671, 4)

 	-- Blessed Bracers -- 29672
 	AddRecipe(29672, 365, 23539, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29672, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeAcquire(29672, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29672, 4)

 	-- Felsteel Longblade -- 29692
 	AddRecipe(29692, 365, 23540, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29692, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeAcquire(29692, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(29692, 2)

 	-- Khorium Champion -- 29693
 	AddRecipe(29693, 365, 23541, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29693, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.TWO_HAND, F.SWORD)
-	self:AddRecipeAcquire(29693, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29693, 4)

 	-- Fel Edged Battleaxe -- 29694
 	AddRecipe(29694, 365, 23542, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29694, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.ONE_HAND, F.AXE)
-	self:AddRecipeAcquire(29694, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29694, 4)

 	-- Felsteel Reaper -- 29695
 	AddRecipe(29695, 365, 23543, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29695, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeAcquire(29695, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29695, 4)

 	-- Runic Hammer -- 29696
 	AddRecipe(29696, 365, 23544, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29696, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeAcquire(29696, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(29696, 2)

 	-- Fel Hardened Maul -- 29697
 	AddRecipe(29697, 365, 23546, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29697, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeAcquire(29697, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29697, 4)

 	-- Eternium Runed Blade -- 29698
 	AddRecipe(29698, 365, 23554, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29698, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeAcquire(29698, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(29698, 4)

 	-- Dirge -- 29699
 	AddRecipe(29699, 365, 23555, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29699, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeAcquire(29699, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(29699, 2)

 	-- Hand of Eternity -- 29700
 	AddRecipe(29700, 365, 23556, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(29700, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.ONE_HAND, F.MACE)
-	self:AddRecipeAcquire(29700, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(29700, 2)

 	-- Lesser Ward of Shielding -- 29728
 	AddRecipe(29728, 340, 23575, Q.COMMON, V.TBC, 340, 340, 345, 350)
@@ -1571,7 +1571,7 @@ function addon:InitBlacksmithing()
 	-- Lesser Rune of Warding -- 32284
 	AddRecipe(32284, 325, 23559, Q.COMMON, V.TBC, 325, 325, 330, 335)
 	self:AddRecipeFlags(32284, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(32284, 28694, 26988, 26981, 29924, 27034, 33609, 26952, 33631, 26564, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(32284, 28694, 26988, 26981, 16823, 33631, 33609, 26952, 29924, 16583, 26904, 33591, 26564, 19341, 27034)

 	-- Greater Rune of Warding -- 32285
 	AddRecipe(32285, 350, 25521, Q.COMMON, V.TBC, 350, 350, 355, 360)
@@ -1581,7 +1581,7 @@ function addon:InitBlacksmithing()
 	-- Fel Iron Rod -- 32655
 	AddRecipe(32655, 300, 25843, Q.COMMON, V.TBC, 300, 300, 305, 310)
 	self:AddRecipeFlags(32655, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(32655, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(32655, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Adamantite Rod -- 32656
 	AddRecipe(32656, 350, 25844, Q.COMMON, V.TBC, 350, 350, 355, 360)
@@ -1596,87 +1596,87 @@ function addon:InitBlacksmithing()
 	-- Nether Chain Shirt -- 34529
 	AddRecipe(34529, 350, 23563, Q.COMMON, V.TBC, 350, 360, 370, 380, 9788)
 	self:AddRecipeFlags(34529, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.HEALER, F.CASTER, F.MAIL)
-	self:AddRecipeTrainer(34529, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(34529, 11177, 29506, 20125, 7230, 5164)

 	-- Twisting Nether Chain Shirt -- 34530
 	AddRecipe(34530, 375, 23564, Q.COMMON, V.TBC, 375, 385, 395, 405, 9788)
 	self:AddRecipeFlags(34530, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(34530, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(34530, 11177, 29506, 20125, 7230, 5164)

 	-- Breastplate of Kings -- 34533
 	AddRecipe(34533, 350, 28483, Q.COMMON, V.TBC, 350, 360, 370, 380, 9788)
 	self:AddRecipeFlags(34533, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(34533, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(34533, 11177, 29506, 20125, 7230, 5164)

 	-- Bulwark of Kings -- 34534
 	AddRecipe(34534, 375, 28484, Q.COMMON, V.TBC, 375, 385, 395, 405, 9788)
 	self:AddRecipeFlags(34534, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(34534, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(34534, 11177, 29506, 20125, 7230, 5164)

 	-- Fireguard -- 34535
 	AddRecipe(34535, 350, 28425, Q.COMMON, V.TBC, 350, 360, 370, 380, 17039)
 	self:AddRecipeFlags(34535, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(34535, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34535, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Blazeguard -- 34537
 	AddRecipe(34537, 375, 28426, Q.COMMON, V.TBC, 375, 385, 395, 405, 17039)
 	self:AddRecipeFlags(34537, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(34537, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34537, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Lionheart Blade -- 34538
 	AddRecipe(34538, 350, 28428, Q.COMMON, V.TBC, 350, 360, 370, 380, 17039)
 	self:AddRecipeFlags(34538, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(34538, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34538, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Lionheart Champion -- 34540
 	AddRecipe(34540, 375, 28429, Q.COMMON, V.TBC, 375, 385, 395, 405, 17039)
 	self:AddRecipeFlags(34540, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(34540, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34540, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- The Planar Edge -- 34541
 	AddRecipe(34541, 350, 28431, Q.COMMON, V.TBC, 350, 360, 370, 380, 17041)
 	self:AddRecipeFlags(34541, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(34541, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34541, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Black Planar Edge -- 34542
 	AddRecipe(34542, 375, 28432, Q.COMMON, V.TBC, 375, 385, 395, 405, 17041)
 	self:AddRecipeFlags(34542, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(34542, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34542, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Lunar Crescent -- 34543
 	AddRecipe(34543, 350, 28434, Q.COMMON, V.TBC, 350, 360, 370, 380, 17041)
 	self:AddRecipeFlags(34543, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeTrainer(34543, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34543, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Mooncleaver -- 34544
 	AddRecipe(34544, 375, 28435, Q.COMMON, V.TBC, 375, 385, 395, 405, 17041)
 	self:AddRecipeFlags(34544, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeTrainer(34544, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34544, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Drakefist Hammer -- 34545
 	AddRecipe(34545, 350, 28437, Q.COMMON, V.TBC, 350, 360, 370, 380, 17040)
 	self:AddRecipeFlags(34545, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(34545, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34545, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Dragonmaw -- 34546
 	AddRecipe(34546, 375, 28438, Q.COMMON, V.TBC, 375, 385, 395, 405, 17040)
 	self:AddRecipeFlags(34546, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(34546, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34546, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Thunder -- 34547
 	AddRecipe(34547, 350, 28440, Q.COMMON, V.TBC, 350, 360, 370, 380, 17040)
 	self:AddRecipeFlags(34547, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeTrainer(34547, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34547, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Deep Thunder -- 34548
 	AddRecipe(34548, 375, 28441, Q.COMMON, V.TBC, 375, 385, 395, 405, 17040)
 	self:AddRecipeFlags(34548, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeTrainer(34548, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(34548, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Fel Weightstone -- 34607
 	AddRecipe(34607, 300, 28420, Q.COMMON, V.TBC, 300, 300, 305, 310)
 	self:AddRecipeFlags(34607, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(34607, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(34607, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Adamantite Weightstone -- 34608
 	AddRecipe(34608, 350, 28421, Q.COMMON, V.TBC, 350, 350, 355, 360)
@@ -1686,127 +1686,127 @@ function addon:InitBlacksmithing()
 	-- Thick Bronze Darts -- 34979
 	AddRecipe(34979, 100, 29201, Q.COMMON, V.TBC, 100, 130, 145, 160)
 	self:AddRecipeFlags(34979, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.THROWN)
-	self:AddRecipeTrainer(34979, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 16724, 3355)
+	self:AddRecipeTrainer(34979, 3355, 3174, 33591, 16724, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Whirling Steel Axes -- 34981
 	AddRecipe(34981, 200, 29202, Q.COMMON, V.TBC, 200, 220, 230, 240)
 	self:AddRecipeFlags(34981, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.THROWN)
-	self:AddRecipeTrainer(34981, 29924, 3174, 33591, 17245, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 26981, 3136, 4258, 514, 33609, 15400, 2836, 27034, 26988, 4596, 28694, 33631, 33675, 5511, 16823, 1241, 16669, 3478, 3355, 16724)
+	self:AddRecipeTrainer(34981, 16724, 3174, 33591, 3355, 29924, 6299, 2998, 26904, 17245, 26564, 26952, 16583, 1241, 3136, 4258, 514, 26988, 28694, 2836, 15400, 33609, 4596, 3557, 33631, 33675, 5511, 16823, 27034, 16669, 3478, 26981, 19341)

 	-- Enchanted Thorium Blades -- 34982
 	AddRecipe(34982, 300, 29203, Q.COMMON, V.TBC, 300, 320, 330, 340)
 	self:AddRecipeFlags(34982, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.THROWN)
-	self:AddRecipeTrainer(34982, 3174, 33591, 29924, 3557, 6299, 2998, 26904, 26564, 19341, 26952, 16583, 17245, 3136, 4258, 514, 26981, 33631, 2836, 27034, 26988, 4596, 28694, 15400, 33675, 5511, 16823, 33609, 1241, 3478, 3355, 16724)
+	self:AddRecipeTrainer(34982, 3174, 29924, 16724, 3355, 6299, 2998, 26904, 33591, 19341, 26952, 16583, 1241, 3136, 4258, 514, 33609, 28694, 2836, 27034, 26988, 4596, 3557, 15400, 33675, 5511, 16823, 33631, 17245, 3478, 26981, 26564)

 	-- Felsteel Whisper Knives -- 34983
 	AddRecipe(34983, 350, 29204, Q.COMMON, V.TBC, 350, 360, 370, 380)
 	self:AddRecipeFlags(34983, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.THROWN)
-	self:AddRecipeTrainer(34983, 28694, 26988, 29924, 33675, 33631, 27034, 33609, 26952, 26564, 26981, 26904, 33591, 16583, 19341, 16823)
+	self:AddRecipeTrainer(34983, 28694, 26988, 16823, 33675, 29924, 33631, 33609, 26952, 16583, 33591, 26904, 26981, 26564, 19341, 27034)

 	-- Earthforged Leggings -- 36122
 	AddRecipe(36122, 260, 30069, Q.COMMON, V.TBC, 260, 280, 290, 300, 9788)
 	self:AddRecipeFlags(36122, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(36122, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(36122, 11177, 29506, 20125, 7230, 5164)

 	-- Windforged Leggings -- 36124
 	AddRecipe(36124, 260, 30070, Q.COMMON, V.TBC, 260, 280, 290, 300, 9788)
 	self:AddRecipeFlags(36124, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(36124, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(36124, 11177, 29506, 20125, 7230, 5164)

 	-- Light Earthforged Blade -- 36125
 	AddRecipe(36125, 260, 30071, Q.COMMON, V.TBC, 260, 280, 290, 300, 9787)
 	self:AddRecipeFlags(36125, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(36125, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36125, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Light Skyforged Axe -- 36126
 	AddRecipe(36126, 260, 30072, Q.COMMON, V.TBC, 260, 280, 290, 300, 9787)
 	self:AddRecipeFlags(36126, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(36126, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36126, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Light Emberforged Hammer -- 36128
 	AddRecipe(36128, 260, 30073, Q.COMMON, V.TBC, 260, 280, 290, 300, 9787)
 	self:AddRecipeFlags(36128, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(36128, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36128, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Heavy Earthforged Breastplate -- 36129
 	AddRecipe(36129, 330, 30074, Q.COMMON, V.TBC, 330, 340, 350, 360, 9788)
 	self:AddRecipeFlags(36129, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(36129, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(36129, 11177, 29506, 20125, 7230, 5164)

 	-- Stormforged Hauberk -- 36130
 	AddRecipe(36130, 330, 30076, Q.COMMON, V.TBC, 330, 340, 350, 360, 9788)
 	self:AddRecipeFlags(36130, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(36130, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(36130, 11177, 29506, 20125, 7230, 5164)

 	-- Windforged Rapier -- 36131
 	AddRecipe(36131, 330, 30077, Q.COMMON, V.TBC, 330, 340, 350, 360, 17039)
 	self:AddRecipeFlags(36131, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(36131, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36131, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Stoneforged Claymore -- 36133
 	AddRecipe(36133, 330, 30086, Q.COMMON, V.TBC, 330, 340, 350, 360, 17039)
 	self:AddRecipeFlags(36133, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(36133, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36133, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Stormforged Axe -- 36134
 	AddRecipe(36134, 330, 30087, Q.COMMON, V.TBC, 330, 340, 350, 360, 17041)
 	self:AddRecipeFlags(36134, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(36134, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36134, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Skyforged Great Axe -- 36135
 	AddRecipe(36135, 330, 30088, Q.COMMON, V.TBC, 330, 340, 350, 360, 17041)
 	self:AddRecipeFlags(36135, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeTrainer(36135, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36135, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Lavaforged Warhammer -- 36136
 	AddRecipe(36136, 330, 30089, Q.COMMON, V.TBC, 330, 340, 350, 360, 17040)
 	self:AddRecipeFlags(36136, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(36136, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36136, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Great Earthforged Hammer -- 36137
 	AddRecipe(36137, 330, 30093, Q.COMMON, V.TBC, 330, 340, 350, 360, 17040)
 	self:AddRecipeFlags(36137, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeTrainer(36137, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36137, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Embrace of the Twisting Nether -- 36256
 	AddRecipe(36256, 375, 23565, Q.COMMON, V.TBC, 375, 385, 395, 405, 9788)
 	self:AddRecipeFlags(36256, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.MAIL)
-	self:AddRecipeTrainer(36256, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(36256, 11177, 29506, 20125, 7230, 5164)

 	-- Bulwark of the Ancient Kings -- 36257
 	AddRecipe(36257, 375, 28485, Q.COMMON, V.TBC, 375, 385, 395, 405, 9788)
 	self:AddRecipeFlags(36257, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(36257, 11177, 5164, 29506, 7230, 20125)
+	self:AddRecipeTrainer(36257, 11177, 29506, 20125, 7230, 5164)

 	-- Blazefury -- 36258
 	AddRecipe(36258, 375, 28427, Q.COMMON, V.TBC, 375, 385, 395, 405, 17039)
 	self:AddRecipeFlags(36258, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(36258, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36258, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Lionheart Executioner -- 36259
 	AddRecipe(36259, 375, 28430, Q.COMMON, V.TBC, 375, 385, 395, 405, 17039)
 	self:AddRecipeFlags(36259, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(36259, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36259, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Wicked Edge of the Planes -- 36260
 	AddRecipe(36260, 375, 28433, Q.COMMON, V.TBC, 375, 385, 395, 405, 17041)
 	self:AddRecipeFlags(36260, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(36260, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36260, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Bloodmoon -- 36261
 	AddRecipe(36261, 375, 28436, Q.COMMON, V.TBC, 375, 385, 395, 405, 17041)
 	self:AddRecipeFlags(36261, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeTrainer(36261, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36261, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Dragonstrike -- 36262
 	AddRecipe(36262, 375, 28439, Q.COMMON, V.TBC, 375, 385, 395, 405, 17040)
 	self:AddRecipeFlags(36262, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(36262, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36262, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Stormherald -- 36263
 	AddRecipe(36263, 375, 28442, Q.COMMON, V.TBC, 375, 385, 395, 405, 17040)
 	self:AddRecipeFlags(36263, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeTrainer(36263, 7232, 29505, 11146, 7231, 20124, 11178)
+	self:AddRecipeTrainer(36263, 7232, 29505, 11146, 7231, 11178, 20124)

 	-- Belt of the Guardian -- 36389
 	AddRecipe(36389, 375, 30034, Q.EPIC, V.TBC, 375, 385, 395, 405)
@@ -1911,12 +1911,12 @@ function addon:InitBlacksmithing()
 	-- Heavy Copper Longsword -- 43549
 	AddRecipe(43549, 35, 33791, Q.UNCOMMON, V.TBC, 35, 75, 95, 115)
 	self:AddRecipeFlags(43549, F.ALLIANCE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeAcquire(43549, A.QUEST, 1578)
+	self:AddRecipeQuest(43549, 1578)

 	-- Hammer of Righteous Might -- 43846
 	AddRecipe(43846, 365, 32854, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(43846, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.TWO_HAND, F.MACE)
-	self:AddRecipeAcquire(43846, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(43846, 4)

 	-- Sunblessed Gauntlets -- 46140
 	AddRecipe(46140, 365, 34380, Q.EPIC, V.TBC, 365, 375, 392, 410)
@@ -1941,117 +1941,117 @@ function addon:InitBlacksmithing()
 	-- Cobalt Legplates -- 52567
 	AddRecipe(52567, 370, 39086, Q.UNCOMMON, V.WOTLK, 370, 375, 380, 385)
 	self:AddRecipeFlags(52567, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(52567, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(52567, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Belt -- 52568
 	AddRecipe(52568, 350, 39087, Q.UNCOMMON, V.WOTLK, 350, 360, 370, 380)
 	self:AddRecipeFlags(52568, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(52568, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(52568, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Boots -- 52569
 	AddRecipe(52569, 350, 39088, Q.UNCOMMON, V.WOTLK, 350, 360, 370, 380)
 	self:AddRecipeFlags(52569, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(52569, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(52569, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Chestpiece -- 52570
 	AddRecipe(52570, 375, 39085, Q.UNCOMMON, V.WOTLK, 375, 380, 385, 390)
 	self:AddRecipeFlags(52570, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(52570, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(52570, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Helm -- 52571
 	AddRecipe(52571, 370, 39084, Q.UNCOMMON, V.WOTLK, 370, 375, 380, 385)
 	self:AddRecipeFlags(52571, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(52571, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(52571, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Shoulders -- 52572
 	AddRecipe(52572, 360, 39083, Q.UNCOMMON, V.WOTLK, 360, 370, 375, 380)
 	self:AddRecipeFlags(52572, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(52572, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(52572, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Triangle Shield -- 54550
 	AddRecipe(54550, 360, 40668, Q.UNCOMMON, V.WOTLK, 360, 370, 375, 380)
 	self:AddRecipeFlags(54550, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.SHIELD, F.ONE_HAND)
-	self:AddRecipeTrainer(54550, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54550, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Saronite Belt -- 54551
 	AddRecipe(54551, 395, 40669, Q.RARE, V.WOTLK, 395, 400, 405, 410)
 	self:AddRecipeFlags(54551, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(54551, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54551, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Saronite Boots -- 54552
 	AddRecipe(54552, 400, 40671, Q.RARE, V.WOTLK, 400, 405, 410, 415)
 	self:AddRecipeFlags(54552, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(54552, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54552, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Saronite Breastplate -- 54553
 	AddRecipe(54553, 400, 40672, Q.RARE, V.WOTLK, 400, 405, 410, 415)
 	self:AddRecipeFlags(54553, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(54553, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54553, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Saronite Legplates -- 54554
 	AddRecipe(54554, 395, 40674, Q.RARE, V.WOTLK, 395, 400, 405, 410)
 	self:AddRecipeFlags(54554, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(54554, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54554, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Saronite Helm -- 54555
 	AddRecipe(54555, 405, 40673, Q.RARE, V.WOTLK, 405, 410, 415, 420)
 	self:AddRecipeFlags(54555, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(54555, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54555, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Saronite Shoulders -- 54556
 	AddRecipe(54556, 405, 40675, Q.RARE, V.WOTLK, 405, 410, 415, 420)
 	self:AddRecipeFlags(54556, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(54556, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54556, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Saronite Defender -- 54557
 	AddRecipe(54557, 390, 40670, Q.RARE, V.WOTLK, 390, 395, 400, 405)
 	self:AddRecipeFlags(54557, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.SHIELD, F.ONE_HAND)
-	self:AddRecipeTrainer(54557, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54557, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Cobalt Helm -- 54917
 	AddRecipe(54917, 375, 40942, Q.UNCOMMON, V.WOTLK, 375, 380, 385, 390)
 	self:AddRecipeFlags(54917, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54917, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54917, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Cobalt Boots -- 54918
 	AddRecipe(54918, 380, 40949, Q.UNCOMMON, V.WOTLK, 380, 385, 390, 395)
 	self:AddRecipeFlags(54918, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54918, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54918, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Cobalt Shoulders -- 54941
 	AddRecipe(54941, 385, 40950, Q.UNCOMMON, V.WOTLK, 385, 390, 395, 400)
 	self:AddRecipeFlags(54941, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54941, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54941, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Cobalt Chestpiece -- 54944
 	AddRecipe(54944, 385, 40951, Q.UNCOMMON, V.WOTLK, 385, 390, 395, 400)
 	self:AddRecipeFlags(54944, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54944, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54944, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Cobalt Gauntlets -- 54945
 	AddRecipe(54945, 390, 40952, Q.UNCOMMON, V.WOTLK, 390, 395, 400, 405)
 	self:AddRecipeFlags(54945, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54945, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54945, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Cobalt Belt -- 54946
 	AddRecipe(54946, 395, 40953, Q.UNCOMMON, V.WOTLK, 395, 400, 405, 410)
 	self:AddRecipeFlags(54946, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54946, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54946, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Cobalt Legplates -- 54947
 	AddRecipe(54947, 395, 40943, Q.UNCOMMON, V.WOTLK, 395, 400, 405, 410)
 	self:AddRecipeFlags(54947, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54947, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54947, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Cobalt Bracers -- 54948
 	AddRecipe(54948, 400, 40954, Q.UNCOMMON, V.WOTLK, 400, 405, 410, 415)
 	self:AddRecipeFlags(54948, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54948, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54948, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Horned Cobalt Helm -- 54949
 	AddRecipe(54949, 400, 40955, Q.UNCOMMON, V.WOTLK, 400, 405, 410, 415)
 	self:AddRecipeFlags(54949, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(54949, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(54949, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Reinforced Cobalt Shoulders -- 54978
 	AddRecipe(54978, 375, 40956, Q.UNCOMMON, V.WOTLK, 375, 395, 400, 405)
@@ -2076,67 +2076,67 @@ function addon:InitBlacksmithing()
 	-- Saronite Protector -- 55013
 	AddRecipe(55013, 390, 41117, Q.RARE, V.WOTLK, 390, 395, 400, 405)
 	self:AddRecipeFlags(55013, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.SHIELD, F.ONE_HAND)
-	self:AddRecipeTrainer(55013, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55013, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Saronite Bulwark -- 55014
 	AddRecipe(55014, 410, 41113, Q.RARE, V.WOTLK, 410, 415, 420, 425)
 	self:AddRecipeFlags(55014, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.SHIELD, F.ONE_HAND)
-	self:AddRecipeTrainer(55014, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55014, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Saronite Gauntlets -- 55015
 	AddRecipe(55015, 415, 41114, Q.RARE, V.WOTLK, 415, 420, 425, 430)
 	self:AddRecipeFlags(55015, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(55015, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55015, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Saronite Bracers -- 55017
 	AddRecipe(55017, 410, 41116, Q.RARE, V.WOTLK, 410, 415, 420, 425)
 	self:AddRecipeFlags(55017, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(55017, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55017, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Saronite Legplates -- 55055
 	AddRecipe(55055, 395, 41126, Q.RARE, V.WOTLK, 395, 400, 405, 410)
 	self:AddRecipeFlags(55055, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(55055, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55055, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Saronite Gauntlets -- 55056
 	AddRecipe(55056, 400, 41127, Q.RARE, V.WOTLK, 400, 405, 410, 415)
 	self:AddRecipeFlags(55056, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(55056, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55056, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Saronite Boots -- 55057
 	AddRecipe(55057, 405, 41128, Q.RARE, V.WOTLK, 405, 410, 415, 420)
 	self:AddRecipeFlags(55057, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(55057, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55057, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Saronite Breastplate -- 55058
 	AddRecipe(55058, 415, 41129, Q.RARE, V.WOTLK, 415, 420, 425, 430)
 	self:AddRecipeFlags(55058, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(55058, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55058, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Honed Cobalt Cleaver -- 55174
 	AddRecipe(55174, 390, 41181, Q.RARE, V.WOTLK, 390, 395, 400, 405)
 	self:AddRecipeFlags(55174, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.AXE)
-	self:AddRecipeTrainer(55174, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55174, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Cobalt Slicer -- 55177
 	AddRecipe(55177, 395, 41182, Q.RARE, V.WOTLK, 395, 400, 405, 410)
 	self:AddRecipeFlags(55177, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(55177, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55177, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Saronite Ambusher -- 55179
 	AddRecipe(55179, 400, 41183, Q.RARE, V.WOTLK, 400, 405, 410, 415)
 	self:AddRecipeFlags(55179, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeTrainer(55179, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55179, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Saronite Shiv -- 55181
 	AddRecipe(55181, 405, 41184, Q.RARE, V.WOTLK, 405, 410, 415, 420)
 	self:AddRecipeFlags(55181, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeTrainer(55181, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55181, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Furious Saronite Beatstick -- 55182
 	AddRecipe(55182, 410, 41185, Q.RARE, V.WOTLK, 410, 415, 420, 425)
 	self:AddRecipeFlags(55182, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(55182, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55182, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Corroded Saronite Edge -- 55183
 	AddRecipe(55183, 415, 41186, Q.RARE, V.WOTLK, 415, 420, 425, 430, 9787)
@@ -2166,292 +2166,292 @@ function addon:InitBlacksmithing()
 	-- Sturdy Cobalt Quickblade -- 55200
 	AddRecipe(55200, 380, 41239, Q.UNCOMMON, V.WOTLK, 380, 385, 390, 395)
 	self:AddRecipeFlags(55200, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(55200, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55200, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Tenderizer -- 55201
 	AddRecipe(55201, 380, 41240, Q.UNCOMMON, V.WOTLK, 380, 385, 390, 395)
 	self:AddRecipeFlags(55201, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(55201, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55201, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Sure-fire Shuriken -- 55202
 	AddRecipe(55202, 385, 41241, Q.UNCOMMON, V.WOTLK, 385, 390, 395, 400)
 	self:AddRecipeFlags(55202, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.THROWN)
-	self:AddRecipeTrainer(55202, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55202, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Forged Cobalt Claymore -- 55203
 	AddRecipe(55203, 385, 41242, Q.UNCOMMON, V.WOTLK, 385, 390, 395, 400)
 	self:AddRecipeFlags(55203, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.SWORD)
-	self:AddRecipeTrainer(55203, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55203, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Notched Cobalt War Axe -- 55204
 	AddRecipe(55204, 390, 41243, Q.UNCOMMON, V.WOTLK, 390, 395, 400, 405)
 	self:AddRecipeFlags(55204, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.AXE)
-	self:AddRecipeTrainer(55204, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55204, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Deadly Saronite Dirk -- 55206
 	AddRecipe(55206, 405, 41245, Q.RARE, V.WOTLK, 405, 415, 420, 425)
 	self:AddRecipeFlags(55206, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK, F.THROWN)
-	self:AddRecipeTrainer(55206, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55206, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Vengeance Bindings -- 55298
 	AddRecipe(55298, 420, 41355, Q.RARE, V.WOTLK, 420, 425, 430, 435)
 	self:AddRecipeFlags(55298, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55298, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55298, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Righteous Gauntlets -- 55300
 	AddRecipe(55300, 420, 41356, Q.RARE, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(55300, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(55300, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55300, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Daunting Handguards -- 55301
 	AddRecipe(55301, 420, 41357, Q.RARE, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(55301, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(55301, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55301, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Helm of Command -- 55302
 	AddRecipe(55302, 425, 41344, Q.RARE, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(55302, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55302, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55302, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Daunting Legplates -- 55303
 	AddRecipe(55303, 425, 41345, Q.RARE, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(55303, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(55303, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55303, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Righteous Greaves -- 55304
 	AddRecipe(55304, 425, 41346, Q.RARE, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(55304, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(55304, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55304, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Saronite Bracers -- 55305
 	AddRecipe(55305, 420, 41354, Q.RARE, V.WOTLK, 420, 425, 430, 435)
 	self:AddRecipeFlags(55305, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55305, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55305, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Saronite Pauldrons -- 55306
 	AddRecipe(55306, 420, 41351, Q.RARE, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(55306, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55306, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55306, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Saronite Waistguard -- 55307
 	AddRecipe(55307, 420, 41352, Q.RARE, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(55307, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55307, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55307, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Saronite Walkers -- 55308
 	AddRecipe(55308, 420, 41348, Q.RARE, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(55308, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55308, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55308, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Saronite Gauntlets -- 55309
 	AddRecipe(55309, 420, 41349, Q.RARE, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(55309, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55309, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55309, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Saronite Legplates -- 55310
 	AddRecipe(55310, 425, 41347, Q.RARE, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(55310, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55310, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55310, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Saronite Hauberk -- 55311
 	AddRecipe(55311, 425, 41353, Q.RARE, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(55311, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55311, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55311, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Savage Saronite Skullshield -- 55312
 	AddRecipe(55312, 425, 41350, Q.RARE, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(55312, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55312, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55312, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titansteel Destroyer -- 55369
 	AddRecipe(55369, 440, 41257, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55369, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND, F.MACE)
-	self:AddRecipeTrainer(55369, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55369, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titansteel Bonecrusher -- 55370
 	AddRecipe(55370, 440, 41383, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55370, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(55370, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55370, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titansteel Guardian -- 55371
 	AddRecipe(55371, 440, 41384, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55371, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(55371, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55371, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Titansteel Helm -- 55372
 	AddRecipe(55372, 440, 41386, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55372, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55372, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55372, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Titansteel Helm -- 55373
 	AddRecipe(55373, 440, 41387, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55373, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(55373, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55373, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Titansteel Helm -- 55374
 	AddRecipe(55374, 440, 41388, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55374, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(55374, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55374, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Spiked Titansteel Treads -- 55375
 	AddRecipe(55375, 440, 41391, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55375, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(55375, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55375, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Tempered Titansteel Treads -- 55376
 	AddRecipe(55376, 440, 41392, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55376, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(55376, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55376, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Titansteel Treads -- 55377
 	AddRecipe(55377, 440, 41394, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(55377, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(55377, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55377, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Socket Bracer -- 55628
 	AddRecipe(55628, 400, nil, Q.COMMON, V.WOTLK, 400, 400, 400, 400)
 	self:AddRecipeFlags(55628, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(55628, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55628, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Socket Gloves -- 55641
 	AddRecipe(55641, 400, nil, Q.COMMON, V.WOTLK, 400, 400, 400, 400)
 	self:AddRecipeFlags(55641, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(55641, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55641, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Eternal Belt Buckle -- 55656
 	AddRecipe(55656, 415, 41611, Q.RARE, V.WOTLK, 415, 420, 425, 430)
 	self:AddRecipeFlags(55656, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(55656, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55656, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titanium Rod -- 55732
 	AddRecipe(55732, 420, 41745, Q.COMMON, V.WOTLK, 420, 425, 430, 435)
 	self:AddRecipeFlags(55732, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(55732, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55732, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Bracers -- 55834
 	AddRecipe(55834, 360, 41974, Q.UNCOMMON, V.WOTLK, 360, 370, 375, 380)
 	self:AddRecipeFlags(55834, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(55834, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55834, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Gauntlets -- 55835
 	AddRecipe(55835, 370, 41975, Q.UNCOMMON, V.WOTLK, 370, 380, 385, 390)
 	self:AddRecipeFlags(55835, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(55835, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55835, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titanium Weapon Chain -- 55839
 	AddRecipe(55839, 420, 41976, Q.UNCOMMON, V.WOTLK, 420, 425, 430, 435)
 	self:AddRecipeFlags(55839, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(55839, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(55839, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titansteel Shanker -- 56234
 	AddRecipe(56234, 440, 42435, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(56234, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeTrainer(56234, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56234, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cudgel of Saronite Justice -- 56280
 	AddRecipe(56280, 410, 42443, Q.RARE, V.WOTLK, 410, 415, 420, 425)
 	self:AddRecipeFlags(56280, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.ONE_HAND, F.MACE)
-	self:AddRecipeTrainer(56280, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56280, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titanium Shield Spike -- 56357
 	AddRecipe(56357, 420, 42500, Q.COMMON, V.WOTLK, 420, 425, 430, 435)
 	self:AddRecipeFlags(56357, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.SHIELD)
-	self:AddRecipeTrainer(56357, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56357, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titansteel Shield Wall -- 56400
 	AddRecipe(56400, 440, 42508, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(56400, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.SHIELD, F.ONE_HAND)
-	self:AddRecipeTrainer(56400, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56400, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Ornate Saronite Bracers -- 56549
 	AddRecipe(56549, 420, 42723, Q.COMMON, V.WOTLK, 420, 425, 430, 435)
 	self:AddRecipeFlags(56549, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(56549, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56549, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Ornate Saronite Pauldrons -- 56550
 	AddRecipe(56550, 420, 42727, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(56550, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(56550, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56550, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Ornate Saronite Waistguard -- 56551
 	AddRecipe(56551, 420, 42729, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(56551, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(56551, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56551, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Ornate Saronite Walkers -- 56552
 	AddRecipe(56552, 420, 42730, Q.RARE, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(56552, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(56552, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56552, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Ornate Saronite Gauntlets -- 56553
 	AddRecipe(56553, 420, 42724, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(56553, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(56553, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56553, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Ornate Saronite Legplates -- 56554
 	AddRecipe(56554, 425, 42726, Q.COMMON, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(56554, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(56554, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56554, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Ornate Saronite Hauberk -- 56555
 	AddRecipe(56555, 425, 42725, Q.COMMON, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(56555, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(56555, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56555, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Ornate Saronite Skullshield -- 56556
 	AddRecipe(56556, 425, 42728, Q.RARE, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(56556, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(56556, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(56556, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Cobalt Skeleton Key -- 59405
 	AddRecipe(59405, 350, 43854, Q.COMMON, V.WOTLK, 350, 360, 365, 370)
 	self:AddRecipeFlags(59405, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59405, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(59405, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titanium Skeleton Key -- 59406
 	AddRecipe(59406, 430, 43853, Q.COMMON, V.WOTLK, 430, 435, 440, 445)
 	self:AddRecipeFlags(59406, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59406, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(59406, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Saronite Belt -- 59436
 	AddRecipe(59436, 395, 43860, Q.COMMON, V.WOTLK, 395, 400, 405, 410)
 	self:AddRecipeFlags(59436, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(59436, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(59436, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Saronite Bracers -- 59438
 	AddRecipe(59438, 400, 43864, Q.COMMON, V.WOTLK, 400, 405, 410, 415)
 	self:AddRecipeFlags(59438, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(59438, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(59438, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Saronite Pauldrons -- 59440
 	AddRecipe(59440, 405, 43865, Q.COMMON, V.WOTLK, 405, 410, 415, 420)
 	self:AddRecipeFlags(59440, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(59440, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(59440, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Brilliant Saronite Helm -- 59441
 	AddRecipe(59441, 415, 43870, Q.COMMON, V.WOTLK, 415, 420, 425, 430)
 	self:AddRecipeFlags(59441, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.PLATE)
-	self:AddRecipeTrainer(59441, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(59441, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Saronite Spellblade -- 59442
 	AddRecipe(59442, 410, 43871, Q.COMMON, V.WOTLK, 410, 415, 420, 425)
 	self:AddRecipeFlags(59442, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.ONE_HAND, F.SWORD)
-	self:AddRecipeTrainer(59442, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(59442, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Icebane Chestguard -- 61008
 	AddRecipe(61008, 425, 43586, Q.COMMON, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(61008, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(61008, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(61008, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Icebane Girdle -- 61009
 	AddRecipe(61009, 420, 43587, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(61009, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(61009, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(61009, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Icebane Treads -- 61010
 	AddRecipe(61010, 420, 43588, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(61010, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(61010, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(61010, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Titanium Plating -- 62202
 	AddRecipe(62202, 450, 44936, Q.RARE, V.WOTLK, 450, 455, 460, 465)
@@ -2462,7 +2462,7 @@ function addon:InitBlacksmithing()
 	-- Titansteel Spellblade -- 63182
 	AddRecipe(63182, 440, 45085, Q.EPIC, V.WOTLK, 440, 450, 460, 470)
 	self:AddRecipeFlags(63182, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.ONE_HAND, F.DAGGER)
-	self:AddRecipeTrainer(63182, 29924, 26988, 26981, 27034, 26952, 26904, 33591, 26564, 28694)
+	self:AddRecipeTrainer(63182, 33591, 26988, 26981, 27034, 26952, 26904, 28694, 29924, 26564)

 	-- Belt of the Titans -- 63187
 	AddRecipe(63187, 450, 45088, Q.EPIC, V.WOTLK, 450, 455, 465, 475)
diff --git a/Database/Cooking.lua b/Database/Cooking.lua
index e97832d..793aaf1 100644
--- a/Database/Cooking.lua
+++ b/Database/Cooking.lua
@@ -58,7 +58,7 @@ function addon:InitCooking()
 	-- Spiced Wolf Meat -- 2539
 	AddRecipe(2539, 10, 2680, Q.COMMON, V.ORIG, 10, 50, 70, 90)
 	self:AddRecipeFlags(2539, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(2539, 1355, 4210, 19369, 3087, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 16719, 3026, 16253, 18987, 17246, 16277, 3067, 18993, 6286, 1382, 1699, 5159, 4552)
+	self:AddRecipeTrainer(2539, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Roasted Boar Meat -- 2540
 	AddRecipe(2540, 1, 2681, Q.COMMON, V.ORIG, 1, 45, 65, 85)
@@ -68,129 +68,129 @@ function addon:InitCooking()
 	-- Coyote Steak -- 2541
 	AddRecipe(2541, 50, 2684, Q.COMMON, V.ORIG, 50, 90, 110, 130)
 	self:AddRecipeFlags(2541, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(2541, 1355, 4210, 19369, 3087, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 16719, 3026, 16253, 18987, 17246, 16277, 3067, 18993, 6286, 1382, 1699, 5159, 4552)
+	self:AddRecipeTrainer(2541, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Goretusk Liver Pie -- 2542
 	AddRecipe(2542, 50, 724, Q.COMMON, V.ORIG, 50, 90, 110, 130)
 	self:AddRecipeFlags(2542, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(2542, 340)
-	self:AddRecipeAcquire(2542, A.QUEST, 22)
+	self:AddRecipeQuest(2542, 22)

 	-- Westfall Stew -- 2543
 	AddRecipe(2543, 75, 733, Q.COMMON, V.ORIG, 75, 115, 135, 155)
 	self:AddRecipeFlags(2543, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE)
 	self:AddRecipeVendor(2543, 340)
-	self:AddRecipeAcquire(2543, A.QUEST, 38)
+	self:AddRecipeQuest(2543, 38)

 	-- Crab Cake -- 2544
 	AddRecipe(2544, 75, 2683, Q.COMMON, V.ORIG, 75, 115, 135, 155)
 	self:AddRecipeFlags(2544, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(2544, 1355, 4210, 19369, 3087, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 16719, 3026, 16253, 18987, 17246, 16277, 3067, 18993, 6286, 1382, 1699, 5159, 4552)
+	self:AddRecipeTrainer(2544, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Cooked Crab Claw -- 2545
 	AddRecipe(2545, 85, 2682, Q.COMMON, V.ORIG, 85, 125, 145, 165)
 	self:AddRecipeFlags(2545, F.ALLIANCE, F.HORDE, F.VENDOR, F.WORLD_DROP, F.IBOE, F.RBOE)
 	self:AddRecipeVendor(2545, 340)
-	self:AddRecipeAcquire(2545, A.WORLD_DROP, 1)
+	self:AddRecipeWorldDrop(2545, 1)

 	-- Dry Pork Ribs -- 2546
 	AddRecipe(2546, 80, 2687, Q.COMMON, V.ORIG, 80, 120, 140, 160)
 	self:AddRecipeFlags(2546, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(2546, 1355, 4210, 19369, 3087, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 16719, 3026, 16253, 18987, 17246, 16277, 3067, 18993, 6286, 1382, 1699, 5159, 4552)
+	self:AddRecipeTrainer(2546, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Redridge Goulash -- 2547
 	AddRecipe(2547, 100, 1082, Q.COMMON, V.ORIG, 100, 135, 155, 175)
 	self:AddRecipeFlags(2547, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(2547, 340)
-	self:AddRecipeAcquire(2547, A.QUEST, 92)
+	self:AddRecipeQuest(2547, 92)

 	-- Succulent Pork Ribs -- 2548
 	AddRecipe(2548, 110, 2685, Q.COMMON, V.ORIG, 110, 130, 150, 170)
 	self:AddRecipeFlags(2548, F.ALLIANCE, F.HORDE, F.VENDOR, F.WORLD_DROP, F.IBOE, F.RBOE)
 	self:AddRecipeVendor(2548, 340)
-	self:AddRecipeAcquire(2548, A.WORLD_DROP, 1)
+	self:AddRecipeWorldDrop(2548, 1)

 	-- Seasoned Wolf Kabob -- 2549
 	AddRecipe(2549, 100, 1017, Q.COMMON, V.ORIG, 100, 140, 160, 180)
 	self:AddRecipeFlags(2549, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(2549, 340)
-	self:AddRecipeAcquire(2549, A.QUEST, 90)
+	self:AddRecipeQuest(2549, 90)

 	-- Beer Basted Boar Ribs -- 2795
 	AddRecipe(2795, 10, 2888, Q.COMMON, V.ORIG, 10, 60, 80, 100)
 	self:AddRecipeFlags(2795, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(2795, 340)
-	self:AddRecipeAcquire(2795, A.QUEST, 384)
+	self:AddRecipeQuest(2795, 384)

 	-- Crocolisk Steak -- 3370
 	AddRecipe(3370, 80, 3662, Q.COMMON, V.ORIG, 80, 120, 140, 160)
 	self:AddRecipeFlags(3370, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(3370, 340)
-	self:AddRecipeAcquire(3370, A.QUEST, 385)
+	self:AddRecipeQuest(3370, 385)

 	-- Blood Sausage -- 3371
 	AddRecipe(3371, 60, 3220, Q.COMMON, V.ORIG, 60, 100, 120, 140)
 	self:AddRecipeFlags(3371, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(3371, 340)
-	self:AddRecipeAcquire(3371, A.QUEST, 418)
+	self:AddRecipeQuest(3371, 418)

 	-- Murloc Fin Soup -- 3372
 	AddRecipe(3372, 90, 3663, Q.COMMON, V.ORIG, 90, 130, 150, 170)
 	self:AddRecipeFlags(3372, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(3372, 340)
-	self:AddRecipeAcquire(3372, A.QUEST, 127)
+	self:AddRecipeQuest(3372, 127)

 	-- Crocolisk Gumbo -- 3373
 	AddRecipe(3373, 120, 3664, Q.COMMON, V.ORIG, 120, 160, 180, 200)
 	self:AddRecipeFlags(3373, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(3373, 340)
-	self:AddRecipeAcquire(3373, A.QUEST, 471)
+	self:AddRecipeQuest(3373, 471)

 	-- Curiously Tasty Omelet -- 3376
 	AddRecipe(3376, 130, 3665, Q.COMMON, V.ORIG, 130, 170, 190, 210)
 	self:AddRecipeFlags(3376, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(3376, 1148, 2821, 340)
-	self:AddRecipeAcquire(3376, A.QUEST, 296)
+	self:AddRecipeQuest(3376, 296)

 	-- Gooey Spider Cake -- 3377
 	AddRecipe(3377, 110, 3666, Q.COMMON, V.ORIG, 110, 150, 170, 190)
 	self:AddRecipeFlags(3377, F.ALLIANCE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(3377, 340)
-	self:AddRecipeAcquire(3377, A.QUEST, 93)
+	self:AddRecipeQuest(3377, 93)

 	-- Big Bear Steak -- 3397
 	AddRecipe(3397, 110, 3726, Q.COMMON, V.ORIG, 110, 150, 170, 190)
 	self:AddRecipeFlags(3397, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(3397, 3960, 12246)
-	self:AddRecipeAcquire(3397, A.QUEST, 498)
+	self:AddRecipeQuest(3397, 498)

 	-- Hot Lion Chops -- 3398
 	AddRecipe(3398, 125, 3727, Q.COMMON, V.ORIG, 125, 175, 195, 215)
 	self:AddRecipeFlags(3398, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(3398, 3489, 12245)
-	self:AddRecipeAcquire(3398, A.QUEST, 501)
+	self:AddRecipeQuest(3398, 501)

 	-- Tasty Lion Steak -- 3399
 	AddRecipe(3399, 150, 3728, Q.COMMON, V.ORIG, 150, 190, 210, 230)
 	self:AddRecipeFlags(3399, F.ALLIANCE, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(3399, A.QUEST, 564)
+	self:AddRecipeQuest(3399, 564)

 	-- Soothing Turtle Bisque -- 3400
 	AddRecipe(3400, 175, 3729, Q.COMMON, V.ORIG, 175, 215, 235, 255)
 	self:AddRecipeFlags(3400, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(3400, A.QUEST, 555, A.QUEST, 7321)
+	self:AddRecipeQuest(3400, 555, 7321)

 	-- Barbecued Buzzard Wing -- 4094
 	AddRecipe(4094, 175, 4457, Q.COMMON, V.ORIG, 175, 215, 235, 255)
 	self:AddRecipeFlags(4094, F.ALLIANCE, F.HORDE, F.TRAINER, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeTrainer(4094, 2818)
 	self:AddRecipeVendor(4094, 2814, 12246)
-	self:AddRecipeAcquire(4094, A.QUEST, 703)
+	self:AddRecipeQuest(4094, 703)

 	-- Kaldorei Spider Kabob -- 6412
 	AddRecipe(6412, 10, 5472, Q.COMMON, V.ORIG, 10, 50, 70, 90)
 	self:AddRecipeFlags(6412, F.ALLIANCE, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(6412, A.QUEST, 4161)
+	self:AddRecipeQuest(6412, 4161)

 	-- Scorpid Surprise -- 6413
 	AddRecipe(6413, 20, 5473, Q.COMMON, V.ORIG, 20, 60, 80, 100)
@@ -211,13 +211,13 @@ function addon:InitCooking()
 	AddRecipe(6416, 50, 5477, Q.COMMON, V.ORIG, 50, 90, 110, 130)
 	self:AddRecipeFlags(6416, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(6416, 3482)
-	self:AddRecipeAcquire(6416, A.QUEST, 2178)
+	self:AddRecipeQuest(6416, 2178)

 	-- Dig Rat Stew -- 6417
 	AddRecipe(6417, 90, 44977, Q.COMMON, V.WOTLK, 90, 130, 150, 170)
 	self:AddRecipeFlags(6417, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOP)
 	self:AddRecipeVendor(6417, 3392)
-	self:AddRecipeAcquire(6417, A.QUEST, 862)
+	self:AddRecipeQuest(6417, 862)

 	-- Crispy Lizard Tail -- 6418
 	AddRecipe(6418, 100, 5479, Q.COMMON, V.ORIG, 100, 140, 160, 180)
@@ -232,12 +232,12 @@ function addon:InitCooking()
 	-- Boiled Clams -- 6499
 	AddRecipe(6499, 50, 5525, Q.COMMON, V.ORIG, 50, 90, 110, 130)
 	self:AddRecipeFlags(6499, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(6499, 1355, 4210, 19369, 3087, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 16719, 3026, 16253, 18987, 17246, 16277, 3067, 18993, 6286, 1382, 1699, 5159, 4552)
+	self:AddRecipeTrainer(6499, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Goblin Deviled Clams -- 6500
 	AddRecipe(6500, 125, 5527, Q.COMMON, V.ORIG, 125, 165, 185, 205)
 	self:AddRecipeFlags(6500, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(6500, 1355, 4210, 19369, 3087, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 16719, 3026, 16253, 18987, 17246, 16277, 3067, 18993, 6286, 1382, 1699, 5159, 4552)
+	self:AddRecipeTrainer(6500, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Clam Chowder -- 6501
 	AddRecipe(6501, 90, 5526, Q.COMMON, V.ORIG, 90, 130, 150, 170)
@@ -252,7 +252,7 @@ function addon:InitCooking()
 	-- Brilliant Smallfish -- 7751
 	AddRecipe(7751, 1, 6290, Q.COMMON, V.ORIG, 1, 45, 65, 85)
 	self:AddRecipeFlags(7751, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(7751, 5940, 1684, 5494, 3550, 66, 8508, 3029, 4574, 4265)
+	self:AddRecipeVendor(7751, 5940, 8508, 5494, 3550, 66, 4265, 3029, 4574, 1684)

 	-- Slitherskin Mackerel -- 7752
 	AddRecipe(7752, 1, 787, Q.COMMON, V.ORIG, 1, 45, 65, 85)
@@ -262,7 +262,7 @@ function addon:InitCooking()
 	-- Longjaw Mud Snapper -- 7753
 	AddRecipe(7753, 50, 4592, Q.COMMON, V.ORIG, 50, 90, 110, 130)
 	self:AddRecipeFlags(7753, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(7753, 5748, 1684, 5940, 5162, 4265, 66, 3027, 4574)
+	self:AddRecipeVendor(7753, 5748, 1684, 4574, 66, 4265, 5940, 3027, 5162)

 	-- Loch Frenzy Delight -- 7754
 	AddRecipe(7754, 50, 6316, Q.COMMON, V.ORIG, 50, 90, 110, 130)
@@ -272,22 +272,22 @@ function addon:InitCooking()
 	-- Bristle Whisker Catfish -- 7755
 	AddRecipe(7755, 100, 4593, Q.COMMON, V.ORIG, 100, 140, 160, 180)
 	self:AddRecipeFlags(7755, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(7755, 3497, 3029, 5494, 4553, 2397, 3027, 2383)
+	self:AddRecipeVendor(7755, 3497, 4553, 2383, 3027, 2397, 5494, 3029)

 	-- Rainbow Fin Albacore -- 7827
 	AddRecipe(7827, 50, 5095, Q.COMMON, V.ORIG, 50, 90, 110, 130)
 	self:AddRecipeFlags(7827, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(7827, 4305, 4307, 5748, 5494, 3333, 4553, 3178, 10118, 5942, 3497)
+	self:AddRecipeVendor(7827, 4305, 4307, 5748, 5494, 3333, 4553, 3178, 10118, 3497, 5942)

 	-- Rockscale Cod -- 7828
 	AddRecipe(7828, 175, 4594, Q.COMMON, V.ORIG, 175, 190, 210, 230)
 	self:AddRecipeFlags(7828, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(7828, 4307, 2664, 3333, 12962, 2383, 3178, 5162, 4574, 12033)
+	self:AddRecipeVendor(7828, 4307, 2664, 3333, 12962, 2383, 12033, 3178, 4574, 5162)

 	-- Savory Deviate Delight -- 8238
 	AddRecipe(8238, 85, 6657, Q.UNCOMMON, V.ORIG, 85, 125, 145, 165)
 	self:AddRecipeFlags(8238, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(8238, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(8238, 2)

 	-- Herb Baked Egg -- 8604
 	AddRecipe(8604, 1, 6888, Q.COMMON, V.ORIG, 1, 45, 65, 85)
@@ -303,7 +303,7 @@ function addon:InitCooking()
 	AddRecipe(9513, 60, 7676, Q.UNCOMMON, V.ORIG, 60, 100, 120, 140)
 	self:AddRecipeFlags(9513, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.ROGUE, F.IBOE, F.RBOP)
 	self:AddRecipeVendor(9513, 6779)
-	self:AddRecipeAcquire(9513, A.QUEST, 2359, A.QUEST, 2478)
+	self:AddRecipeQuest(9513, 2359, 2478)

 	-- Goldthorn Tea -- 13028
 	AddRecipe(13028, 175, 10841, Q.COMMON, V.ORIG, 175, 175, 190, 205)
@@ -358,7 +358,7 @@ function addon:InitCooking()
 	-- Monster Omelet -- 15933
 	AddRecipe(15933, 225, 12218, Q.COMMON, V.ORIG, 225, 250, 262, 275)
 	self:AddRecipeFlags(15933, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(15933, 11187, 2806, 2803)
+	self:AddRecipeVendor(15933, 2803, 2806, 11187)

 	-- Crispy Bat Wing -- 15935
 	AddRecipe(15935, 1, 12224, Q.COMMON, V.ORIG, 1, 45, 65, 85)
@@ -423,24 +423,24 @@ function addon:InitCooking()
 	-- Mithril Head Trout -- 20916
 	AddRecipe(20916, 175, 8364, Q.COMMON, V.ORIG, 175, 215, 235, 255)
 	self:AddRecipeFlags(20916, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(20916, 4307, 2664, 3333, 12962, 2383, 3178, 5162, 4574, 12033)
+	self:AddRecipeVendor(20916, 4307, 2664, 3333, 12962, 2383, 12033, 3178, 4574, 5162)

 	-- Gingerbread Cookie -- 21143
 	AddRecipe(21143, 1, 17197, Q.COMMON, V.ORIG, 1, 45, 65, 85)
 	self:AddRecipeFlags(21143, F.ALLIANCE, F.HORDE, F.VENDOR, F.SEASONAL, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(21143, 13420, 23064, 13435, 13432, 13429, 13433, 23012, 23010)
+	self:AddRecipeVendor(21143, 23064, 23010, 13435, 13432, 13429, 13433, 23012, 13420)
 	self:AddRecipeAcquire(21143, A.SEASONAL, 1)

 	-- Egg Nog -- 21144
 	AddRecipe(21144, 35, 17198, Q.COMMON, V.ORIG, 35, 75, 95, 115)
 	self:AddRecipeFlags(21144, F.ALLIANCE, F.HORDE, F.VENDOR, F.SEASONAL, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(21144, 13420, 23064, 13435, 13432, 13429, 13433, 23012, 23010)
+	self:AddRecipeVendor(21144, 23064, 23010, 13435, 13432, 13429, 13433, 23012, 13420)
 	self:AddRecipeAcquire(21144, A.SEASONAL, 1)

 	-- Spider Sausage -- 21175
 	AddRecipe(21175, 200, 17222, Q.COMMON, V.ORIG, 200, 225, 237, 250)
 	self:AddRecipeFlags(21175, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(21175, 1355, 4210, 19369, 3087, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 16719, 3026, 16253, 18987, 17246, 16277, 3067, 18993, 6286, 1382, 1699, 5159, 4552)
+	self:AddRecipeTrainer(21175, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Tender Wolf Steak -- 22480
 	AddRecipe(22480, 225, 18045, Q.COMMON, V.ORIG, 225, 250, 262, 275)
@@ -460,28 +460,28 @@ function addon:InitCooking()
 	-- Smoked Desert Dumplings -- 24801
 	AddRecipe(24801, 285, 20452, Q.COMMON, V.ORIG, 285, 310, 322, 335)
 	self:AddRecipeFlags(24801, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeAcquire(24801, A.QUEST, 8313)
+	self:AddRecipeQuest(24801, 8313)

 	-- Dirge's Kickin' Chimaerok Chops -- 25659
 	AddRecipe(25659, 300, 21023, Q.EPIC, V.ORIG, 300, 325, 337, 350)
 	self:AddRecipeFlags(25659, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(25659, A.QUEST, 8586)
+	self:AddRecipeQuest(25659, 8586)

 	-- Smoked Sagefish -- 25704
 	AddRecipe(25704, 80, 21072, Q.COMMON, V.ORIG, 80, 120, 140, 160)
 	self:AddRecipeFlags(25704, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(25704, 2397, 16718, 3085, 17246, 3027, 14738, 5160, 4265, 8307, 4223, 5483, 3400, 2381, 2664, 16677, 19195, 26868, 12033, 16253, 4553)
+	self:AddRecipeVendor(25704, 2397, 16718, 3085, 17246, 3027, 14738, 5160, 4265, 8307, 4223, 5483, 3400, 2381, 2664, 4553, 19195, 26868, 16253, 12033, 16677)

 	-- Sagefish Delight -- 25954
 	AddRecipe(25954, 175, 21217, Q.COMMON, V.ORIG, 175, 215, 235, 255)
 	self:AddRecipeFlags(25954, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(25954, 2397, 16718, 3085, 17246, 3027, 14738, 5160, 4265, 8307, 4223, 5483, 3400, 2381, 2664, 16677, 19195, 26868, 12033, 16253, 4553)
+	self:AddRecipeVendor(25954, 2397, 16718, 3085, 17246, 3027, 14738, 5160, 4265, 8307, 4223, 5483, 3400, 2381, 2664, 4553, 19195, 26868, 16253, 12033, 16677)

 	-- Crunchy Spider Surprise -- 28267
 	AddRecipe(28267, 60, 22645, Q.COMMON, V.TBC, 60, 100, 120, 140)
 	self:AddRecipeFlags(28267, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(28267, 16253, 18427)
-	self:AddRecipeAcquire(28267, A.QUEST, 9171)
+	self:AddRecipeQuest(28267, 9171)

 	-- Lynx Steak -- 33276
 	AddRecipe(33276, 1, 27635, Q.COMMON, V.TBC, 1, 45, 65, 85)
@@ -491,7 +491,7 @@ function addon:InitCooking()
 	-- Roasted Moongraze Tenderloin -- 33277
 	AddRecipe(33277, 1, 24105, Q.COMMON, V.TBC, 1, 45, 65, 85)
 	self:AddRecipeFlags(33277, F.ALLIANCE, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(33277, A.QUEST, 9454)
+	self:AddRecipeQuest(33277, 9454)

 	-- Bat Bites -- 33278
 	AddRecipe(33278, 50, 27636, Q.COMMON, V.TBC, 50, 90, 110, 130)
@@ -501,7 +501,7 @@ function addon:InitCooking()
 	-- Buzzard Bites -- 33279
 	AddRecipe(33279, 300, 27651, Q.COMMON, V.TBC, 300, 320, 330, 340)
 	self:AddRecipeFlags(33279, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(33279, A.QUEST, 9356)
+	self:AddRecipeQuest(33279, 9356)

 	-- Ravager Dog -- 33284
 	AddRecipe(33284, 300, 27655, Q.COMMON, V.TBC, 300, 320, 330, 340)
@@ -576,19 +576,19 @@ function addon:InitCooking()
 	-- Spice Bread -- 37836
 	AddRecipe(37836, 1, 30816, Q.COMMON, V.TBC, 1, 30, 35, 38)
 	self:AddRecipeFlags(37836, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(37836, 1355, 4210, 19369, 3087, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 16719, 3026, 16253, 18987, 17246, 16277, 3067, 18993, 6286, 1382, 1699, 5159, 4552)
+	self:AddRecipeTrainer(37836, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Mok'Nathal Shortribs -- 38867
 	AddRecipe(38867, 335, 31672, Q.COMMON, V.TBC, 335, 355, 365, 375)
 	self:AddRecipeFlags(38867, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(38867, 20916, 21113)
-	self:AddRecipeAcquire(38867, A.QUEST, 10860)
+	self:AddRecipeQuest(38867, 10860)

 	-- Crunchy Serpent -- 38868
 	AddRecipe(38868, 335, 31673, Q.COMMON, V.TBC, 335, 355, 365, 375)
 	self:AddRecipeFlags(38868, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
 	self:AddRecipeVendor(38868, 20916, 21113)
-	self:AddRecipeAcquire(38868, A.QUEST, 10860)
+	self:AddRecipeQuest(38868, 10860)

 	-- Stewed Trout -- 42296
 	AddRecipe(42296, 320, 33048, Q.COMMON, V.TBC, 320, 335, 345, 355)
@@ -608,32 +608,38 @@ function addon:InitCooking()
 	-- Skullfish Soup -- 43707
 	AddRecipe(43707, 325, 33825, Q.UNCOMMON, V.TBC, 325, 335, 345, 355)
 	self:AddRecipeFlags(43707, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(43707, A.QUEST, 11377, A.QUEST, 11379, A.QUEST, 11380, A.QUEST, 11381, A.CUSTOM, 6)
+	self:AddRecipeQuest(43707, 11381, 11377, 11379, 11380)
+	self:AddRecipeAcquire(43707, A.CUSTOM, 6)

 	-- Stormchops -- 43758
 	AddRecipe(43758, 300, 33866, Q.RARE, V.TBC, 300, 320, 330, 340)
 	self:AddRecipeFlags(43758, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(43758, A.QUEST, 11377, A.QUEST, 11379, A.QUEST, 11380, A.QUEST, 11381, A.CUSTOM, 5, A.CUSTOM, 6, A.CUSTOM, 38)
+	self:AddRecipeQuest(43758, 11381, 11377, 11379, 11380)
+	self:AddRecipeAcquire(43758, A.CUSTOM, 5, A.CUSTOM, 6, A.CUSTOM, 38)

 	-- Broiled Bloodfin -- 43761
 	AddRecipe(43761, 300, 33867, Q.UNCOMMON, V.TBC, 300, 320, 330, 340)
 	self:AddRecipeFlags(43761, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(43761, A.QUEST, 11377, A.QUEST, 11379, A.QUEST, 11380, A.QUEST, 11381, A.CUSTOM, 6)
+	self:AddRecipeQuest(43761, 11381, 11377, 11379, 11380)
+	self:AddRecipeAcquire(43761, A.CUSTOM, 6)

 	-- Spicy Hot Talbuk -- 43765
 	AddRecipe(43765, 325, 33872, Q.UNCOMMON, V.TBC, 325, 335, 345, 355)
 	self:AddRecipeFlags(43765, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(43765, A.QUEST, 11377, A.QUEST, 11379, A.QUEST, 11380, A.QUEST, 11381, A.CUSTOM, 5)
+	self:AddRecipeQuest(43765, 11381, 11377, 11379, 11380)
+	self:AddRecipeAcquire(43765, A.CUSTOM, 5)

 	-- Kibler's Bits -- 43772
 	AddRecipe(43772, 300, 33874, Q.UNCOMMON, V.TBC, 300, 345, 355, 365)
 	self:AddRecipeFlags(43772, F.ALLIANCE, F.HORDE, F.QUEST, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeAcquire(43772, A.QUEST, 11377, A.QUEST, 11379, A.QUEST, 11380, A.QUEST, 11381, A.CUSTOM, 5, A.CUSTOM, 6)
+	self:AddRecipeQuest(43772, 11381, 11377, 11379, 11380)
+	self:AddRecipeAcquire(43772, A.CUSTOM, 5, A.CUSTOM, 6)

 	-- Delicious Chocolate Cake -- 43779
 	AddRecipe(43779, 1, 33924, Q.RARE, V.TBC, 1, 50, 62, 75)
 	self:AddRecipeFlags(43779, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(43779, A.QUEST, 11377, A.QUEST, 11379, A.QUEST, 11380, A.QUEST, 11381, A.CUSTOM, 5, A.CUSTOM, 6, A.CUSTOM, 38)
+	self:AddRecipeQuest(43779, 11381, 11377, 11379, 11380)
+	self:AddRecipeAcquire(43779, A.CUSTOM, 5, A.CUSTOM, 6, A.CUSTOM, 38)

 	-- Hot Apple Cider -- 45022
 	AddRecipe(45022, 325, 34411, Q.COMMON, V.WOTLK, 325, 325, 325, 325)
@@ -644,32 +650,32 @@ function addon:InitCooking()
 	-- Mammoth Meal -- 45549
 	AddRecipe(45549, 350, 34748, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45549, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(45549, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45549, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Shoveltusk Steak -- 45550
 	AddRecipe(45550, 350, 34749, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45550, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(45550, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45550, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Worm Delight -- 45551
 	AddRecipe(45551, 350, 34750, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45551, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45551, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45551, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Roasted Worg -- 45552
 	AddRecipe(45552, 350, 34751, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45552, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45552, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45552, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Rhino Dogs -- 45553
 	AddRecipe(45553, 350, 34752, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45553, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45553, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45553, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Great Feast -- 45554
 	AddRecipe(45554, 375, 34753, Q.COMMON, V.WOTLK, 375, 375, 400, 425)
 	self:AddRecipeFlags(45554, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(45554, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45554, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Mega Mammoth Meal -- 45555
 	AddRecipe(45555, 400, 34754, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460)
@@ -699,37 +705,37 @@ function addon:InitCooking()
 	-- Smoked Rockfin -- 45560
 	AddRecipe(45560, 350, 34759, Q.COMMON, V.WOTLK, 350, 350, 365, 380)
 	self:AddRecipeFlags(45560, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45560, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45560, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Grilled Bonescale -- 45561
 	AddRecipe(45561, 350, 34760, Q.COMMON, V.WOTLK, 350, 350, 365, 380)
 	self:AddRecipeFlags(45561, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45561, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45561, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Sauteed Goby -- 45562
 	AddRecipe(45562, 350, 34761, Q.COMMON, V.WOTLK, 350, 350, 365, 380)
 	self:AddRecipeFlags(45562, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45562, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45562, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Grilled Sculpin -- 45563
 	AddRecipe(45563, 350, 34762, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45563, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(45563, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45563, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Smoked Salmon -- 45564
 	AddRecipe(45564, 350, 34763, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45564, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(45564, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45564, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Poached Nettlefish -- 45565
 	AddRecipe(45565, 350, 34764, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45565, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45565, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45565, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Pickled Fangtooth -- 45566
 	AddRecipe(45566, 350, 34765, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45566, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45566, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45566, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Poached Northern Sculpin -- 45567
 	AddRecipe(45567, 400, 34766, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460)
@@ -744,7 +750,7 @@ function addon:InitCooking()
 	-- Baked Manta Ray -- 45569
 	AddRecipe(45569, 350, 42942, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(45569, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(45569, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(45569, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Imperial Manta Steak -- 45570
 	AddRecipe(45570, 400, 34769, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460)
@@ -759,7 +765,8 @@ function addon:InitCooking()
 	-- Captain Rumsey's Lager -- 45695
 	AddRecipe(45695, 100, 34832, Q.UNCOMMON, V.WOTLK, 100, 100, 105, 110)
 	self:AddRecipeFlags(45695, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(45695, A.QUEST, 11666, A.QUEST, 11667, A.QUEST, 11668, A.QUEST, 11669, A.CUSTOM, 7)
+	self:AddRecipeQuest(45695, 11666, 11668, 11667, 11669)
+	self:AddRecipeAcquire(45695, A.CUSTOM, 7)

 	-- Charred Bear Kabobs -- 46684
 	AddRecipe(46684, 250, 35563, Q.COMMON, V.WOTLK, 250, 275, 285, 295)
@@ -774,12 +781,13 @@ function addon:InitCooking()
 	-- Kungaloosh -- 53056
 	AddRecipe(53056, 375, 39520, Q.COMMON, V.WOTLK, 375, 375, 387, 400)
 	self:AddRecipeFlags(53056, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(53056, A.QUEST, 13571, A.CUSTOM, 36)
+	self:AddRecipeQuest(53056, 13571)
+	self:AddRecipeAcquire(53056, A.CUSTOM, 36)

 	-- Northern Stew -- 57421
 	AddRecipe(57421, 350, 34747, Q.COMMON, V.WOTLK, 350, 350, 362, 365)
 	self:AddRecipeFlags(57421, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(57421, A.QUEST, 13088, A.QUEST, 13087, A.QUEST, 13089, A.QUEST, 13090)
+	self:AddRecipeQuest(57421, 13088, 13087, 13089, 13090)

 	-- Fish Feast -- 57423
 	AddRecipe(57423, 450, 43015, Q.UNCOMMON, V.WOTLK, 450, 455, 460, 465)
@@ -844,27 +852,27 @@ function addon:InitCooking()
 	-- Dalaran Clam Chowder -- 58065
 	AddRecipe(58065, 350, 43268, Q.COMMON, V.WOTLK, 350, 350, 382, 415)
 	self:AddRecipeFlags(58065, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(58065, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(58065, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Tasty Cupcake -- 58512
 	AddRecipe(58512, 350, 43490, Q.UNCOMMON, V.WOTLK, 350, 350, 357, 365)
 	self:AddRecipeFlags(58512, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(58512, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(58512, 2)

 	-- Last Week's Mammoth -- 58521
 	AddRecipe(58521, 350, 43488, Q.UNCOMMON, V.WOTLK, 350, 350, 357, 365)
 	self:AddRecipeFlags(58521, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(58521, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(58521, 2)

 	-- Bad Clams -- 58523
 	AddRecipe(58523, 350, 43491, Q.UNCOMMON, V.WOTLK, 350, 350, 357, 365)
 	self:AddRecipeFlags(58523, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(58523, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(58523, 2)

 	-- Haunted Herring -- 58525
 	AddRecipe(58525, 350, 43492, Q.UNCOMMON, V.WOTLK, 350, 350, 357, 365)
 	self:AddRecipeFlags(58525, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(58525, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(58525, 2)

 	-- Gigantic Feast -- 58527
 	AddRecipe(58527, 425, 43478, Q.UNCOMMON, V.WOTLK, 425, 435, 455, 475)
@@ -884,12 +892,12 @@ function addon:InitCooking()
 	-- Clamlette Magnifique -- 64054
 	AddRecipe(64054, 250, 33004, Q.COMMON, V.WOTLK, 250, 250, 275, 300)
 	self:AddRecipeFlags(64054, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(64054, A.QUEST, 6610)
+	self:AddRecipeQuest(64054, 6610)

 	-- Black Jelly -- 64358
 	AddRecipe(64358, 400, 45932, Q.COMMON, V.WOTLK, 400, 400, 412, 425)
 	self:AddRecipeFlags(64358, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(64358, 29631, 26972, 33587, 26953, 26905, 28705, 26989)
+	self:AddRecipeTrainer(64358, 29631, 26972, 26989, 26953, 33587, 28705, 26905)

 	-- Bread of the Dead -- 65454
 	AddRecipe(65454, 45, 46691, Q.COMMON, V.WOTLK, 45, 55, 60, 65)
diff --git a/Database/Enchanting.lua b/Database/Enchanting.lua
index 60080f8..511b10e 100644
--- a/Database/Enchanting.lua
+++ b/Database/Enchanting.lua
@@ -58,7 +58,7 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Minor Health -- 7420
 	AddRecipe(7420, 15, nil, Q.COMMON, V.ORIG, 15, 70, 90, 110)
 	self:AddRecipeFlags(7420, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(7420, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7420, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Runed Copper Rod -- 7421
 	AddRecipe(7421, 1, 6218, Q.COMMON, V.ORIG, 1, 5, 7, 10)
@@ -68,7 +68,7 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Minor Absorption -- 7426
 	AddRecipe(7426, 40, nil, Q.COMMON, V.ORIG, 40, 90, 110, 130)
 	self:AddRecipeFlags(7426, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(7426, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7426, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Enchant Bracer - Minor Deflection -- 7428
 	AddRecipe(7428, 1, nil, Q.COMMON, V.ORIG, 1, 80, 100, 120)
@@ -78,37 +78,37 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Minor Mana -- 7443
 	AddRecipe(7443, 20, nil, Q.UNCOMMON, V.ORIG, 20, 80, 100, 120)
 	self:AddRecipeFlags(7443, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(7443, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7443, 2)

 	-- Enchant Cloak - Minor Resistance -- 7454
 	AddRecipe(7454, 45, nil, Q.COMMON, V.ORIG, 45, 95, 115, 135)
 	self:AddRecipeFlags(7454, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeTrainer(7454, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7454, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Enchant Bracer - Minor Stamina -- 7457
 	AddRecipe(7457, 50, nil, Q.COMMON, V.ORIG, 50, 100, 120, 140)
 	self:AddRecipeFlags(7457, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(7457, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7457, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Enchant 2H Weapon - Minor Impact -- 7745
 	AddRecipe(7745, 100, nil, Q.COMMON, V.ORIG, 100, 130, 150, 170)
 	self:AddRecipeFlags(7745, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.TWO_HAND)
-	self:AddRecipeTrainer(7745, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 1317, 33676, 4213, 5695, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7745, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 16160, 33676, 4213, 3345, 3011, 5695, 7949, 1317)

 	-- Enchant Chest - Lesser Health -- 7748
 	AddRecipe(7748, 60, nil, Q.COMMON, V.ORIG, 60, 105, 125, 145)
 	self:AddRecipeFlags(7748, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(7748, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7748, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Enchant Bracer - Minor Spirit -- 7766
 	AddRecipe(7766, 60, nil, Q.UNCOMMON, V.ORIG, 60, 105, 125, 145)
 	self:AddRecipeFlags(7766, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(7766, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7766, 2)

 	-- Enchant Cloak - Minor Protection -- 7771
 	AddRecipe(7771, 70, nil, Q.COMMON, V.ORIG, 70, 110, 130, 150)
 	self:AddRecipeFlags(7771, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeTrainer(7771, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7771, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Enchant Chest - Lesser Mana -- 7776
 	AddRecipe(7776, 80, nil, Q.UNCOMMON, V.ORIG, 80, 115, 135, 155)
@@ -118,22 +118,22 @@ function addon:InitEnchanting()
 	-- Enchant Bracer - Minor Agility -- 7779
 	AddRecipe(7779, 80, nil, Q.COMMON, V.ORIG, 80, 115, 135, 155)
 	self:AddRecipeFlags(7779, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(7779, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 1317, 33676, 4213, 5695, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7779, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 16160, 33676, 4213, 3345, 3011, 5695, 7949, 1317)

 	-- Enchant Bracer - Minor Strength -- 7782
 	AddRecipe(7782, 80, nil, Q.UNCOMMON, V.ORIG, 80, 115, 135, 155)
 	self:AddRecipeFlags(7782, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(7782, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7782, 2)

 	-- Enchant Weapon - Minor Beastslayer -- 7786
 	AddRecipe(7786, 90, nil, Q.UNCOMMON, V.ORIG, 90, 120, 140, 160)
 	self:AddRecipeFlags(7786, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeAcquire(7786, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7786, 2)

 	-- Enchant Weapon - Minor Striking -- 7788
 	AddRecipe(7788, 90, nil, Q.COMMON, V.ORIG, 90, 120, 140, 160)
 	self:AddRecipeFlags(7788, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeTrainer(7788, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 1317, 33676, 4213, 5695, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7788, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 16160, 33676, 4213, 3345, 3011, 5695, 7949, 1317)

 	-- Enchant 2H Weapon - Lesser Intellect -- 7793
 	AddRecipe(7793, 100, nil, Q.COMMON, V.ORIG, 100, 130, 150, 170)
@@ -143,27 +143,27 @@ function addon:InitEnchanting()
 	-- Runed Silver Rod -- 7795
 	AddRecipe(7795, 100, 6339, Q.COMMON, V.ORIG, 100, 130, 150, 170)
 	self:AddRecipeFlags(7795, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(7795, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 1317, 33676, 4213, 5695, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7795, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 16160, 33676, 4213, 3345, 3011, 5695, 7949, 1317)

 	-- Enchant Chest - Health -- 7857
 	AddRecipe(7857, 120, nil, Q.COMMON, V.ORIG, 120, 145, 165, 185)
 	self:AddRecipeFlags(7857, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(7857, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7857, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Bracer - Lesser Spirit -- 7859
 	AddRecipe(7859, 120, nil, Q.UNCOMMON, V.ORIG, 120, 145, 165, 185)
 	self:AddRecipeFlags(7859, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(7859, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7859, 2)

 	-- Enchant Cloak - Lesser Fire Resistance -- 7861
 	AddRecipe(7861, 125, nil, Q.COMMON, V.ORIG, 125, 150, 170, 190)
 	self:AddRecipeFlags(7861, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeTrainer(7861, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7861, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Boots - Minor Stamina -- 7863
 	AddRecipe(7863, 125, nil, Q.COMMON, V.ORIG, 125, 150, 170, 190)
 	self:AddRecipeFlags(7863, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(7863, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(7863, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Boots - Minor Agility -- 7867
 	AddRecipe(7867, 125, nil, Q.UNCOMMON, V.ORIG, 125, 150, 170, 190)
@@ -173,53 +173,53 @@ function addon:InitEnchanting()
 	-- Enchant Shield - Minor Stamina -- 13378
 	AddRecipe(13378, 105, nil, Q.COMMON, V.ORIG, 105, 130, 150, 170)
 	self:AddRecipeFlags(13378, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.SHIELD)
-	self:AddRecipeTrainer(13378, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13378, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 1317, 4213, 33676, 3011, 3345, 7949, 16160)

 	-- Enchant 2H Weapon - Lesser Spirit -- 13380
 	AddRecipe(13380, 110, nil, Q.UNCOMMON, V.ORIG, 110, 135, 155, 175)
 	self:AddRecipeFlags(13380, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.TWO_HAND)
-	self:AddRecipeAcquire(13380, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13380, 2)

 	-- Enchant Cloak - Minor Agility -- 13419
 	AddRecipe(13419, 110, nil, Q.UNCOMMON, V.ORIG, 110, 135, 155, 175)
 	self:AddRecipeFlags(13419, F.ALLIANCE, F.HORDE, F.VENDOR, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.CLOAK)
 	self:AddRecipeVendor(13419, 3954, 12043)
-	self:AddRecipeAcquire(13419, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13419, 2)

 	-- Enchant Cloak - Lesser Protection -- 13421
 	AddRecipe(13421, 115, nil, Q.COMMON, V.ORIG, 115, 140, 160, 180)
 	self:AddRecipeFlags(13421, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeTrainer(13421, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13421, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Shield - Lesser Protection -- 13464
 	AddRecipe(13464, 115, nil, Q.UNCOMMON, V.ORIG, 115, 140, 160, 180)
 	self:AddRecipeFlags(13464, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.SHIELD)
-	self:AddRecipeAcquire(13464, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13464, 2)

 	-- Enchant Shield - Lesser Spirit -- 13485
 	AddRecipe(13485, 130, nil, Q.COMMON, V.ORIG, 130, 155, 175, 195)
 	self:AddRecipeFlags(13485, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.SHIELD)
-	self:AddRecipeTrainer(13485, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13485, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Bracer - Lesser Stamina -- 13501
 	AddRecipe(13501, 130, nil, Q.COMMON, V.ORIG, 130, 155, 175, 195)
 	self:AddRecipeFlags(13501, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13501, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13501, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Weapon - Lesser Striking -- 13503
 	AddRecipe(13503, 140, nil, Q.COMMON, V.ORIG, 140, 165, 185, 205)
 	self:AddRecipeFlags(13503, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeTrainer(13503, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13503, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Cloak - Lesser Shadow Resistance -- 13522
 	AddRecipe(13522, 135, nil, Q.UNCOMMON, V.ORIG, 135, 160, 180, 200)
 	self:AddRecipeFlags(13522, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeAcquire(13522, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13522, 2)

 	-- Enchant 2H Weapon - Lesser Impact -- 13529
 	AddRecipe(13529, 145, nil, Q.COMMON, V.ORIG, 145, 170, 190, 210)
 	self:AddRecipeFlags(13529, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.TWO_HAND)
-	self:AddRecipeTrainer(13529, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13529, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Bracer - Lesser Strength -- 13536
 	AddRecipe(13536, 140, nil, Q.UNCOMMON, V.ORIG, 140, 165, 185, 205)
@@ -229,12 +229,12 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Lesser Absorption -- 13538
 	AddRecipe(13538, 140, nil, Q.COMMON, V.ORIG, 140, 165, 185, 205)
 	self:AddRecipeFlags(13538, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13538, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13538, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Chest - Mana -- 13607
 	AddRecipe(13607, 145, nil, Q.COMMON, V.ORIG, 145, 170, 190, 210)
 	self:AddRecipeFlags(13607, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13607, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13607, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Gloves - Mining -- 13612
 	AddRecipe(13612, 145, nil, Q.UNCOMMON, V.ORIG, 145, 170, 190, 210)
@@ -254,47 +254,47 @@ function addon:InitEnchanting()
 	-- Enchant Bracer - Lesser Intellect -- 13622
 	AddRecipe(13622, 150, nil, Q.COMMON, V.ORIG, 150, 175, 195, 215)
 	self:AddRecipeFlags(13622, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13622, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13622, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Chest - Minor Stats -- 13626
 	AddRecipe(13626, 150, nil, Q.COMMON, V.ORIG, 150, 175, 195, 215)
 	self:AddRecipeFlags(13626, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13626, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13626, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Runed Golden Rod -- 13628
 	AddRecipe(13628, 150, 11130, Q.COMMON, V.ORIG, 150, 175, 195, 215)
 	self:AddRecipeFlags(13628, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(13628, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 1317, 4213, 33676, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13628, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 4616, 5695, 1317, 4213, 3345, 3011, 33676, 7949, 16160)

 	-- Enchant Shield - Lesser Stamina -- 13631
 	AddRecipe(13631, 155, nil, Q.COMMON, V.ORIG, 155, 175, 195, 215)
 	self:AddRecipeFlags(13631, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.SHIELD)
-	self:AddRecipeTrainer(13631, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13631, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Cloak - Defense -- 13635
 	AddRecipe(13635, 155, nil, Q.COMMON, V.ORIG, 155, 175, 195, 215)
 	self:AddRecipeFlags(13635, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.TANK, F.CLOAK)
-	self:AddRecipeTrainer(13635, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13635, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Boots - Lesser Agility -- 13637
 	AddRecipe(13637, 160, nil, Q.COMMON, V.ORIG, 160, 180, 200, 220)
 	self:AddRecipeFlags(13637, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(13637, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13637, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Chest - Greater Health -- 13640
 	AddRecipe(13640, 160, nil, Q.COMMON, V.ORIG, 160, 180, 200, 220)
 	self:AddRecipeFlags(13640, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13640, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13640, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Bracer - Spirit -- 13642
 	AddRecipe(13642, 165, nil, Q.COMMON, V.ORIG, 165, 185, 205, 225)
 	self:AddRecipeFlags(13642, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(13642, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13642, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Boots - Lesser Stamina -- 13644
 	AddRecipe(13644, 170, nil, Q.COMMON, V.ORIG, 170, 190, 210, 230)
 	self:AddRecipeFlags(13644, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13644, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13644, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Bracer - Lesser Deflection -- 13646
 	AddRecipe(13646, 170, nil, Q.UNCOMMON, V.ORIG, 170, 190, 210, 230)
@@ -304,57 +304,57 @@ function addon:InitEnchanting()
 	-- Enchant Bracer - Stamina -- 13648
 	AddRecipe(13648, 170, nil, Q.COMMON, V.ORIG, 170, 190, 210, 230)
 	self:AddRecipeFlags(13648, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13648, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13648, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Weapon - Lesser Beastslayer -- 13653
 	AddRecipe(13653, 175, nil, Q.UNCOMMON, V.ORIG, 175, 195, 215, 235)
 	self:AddRecipeFlags(13653, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeAcquire(13653, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13653, 2)

 	-- Enchant Weapon - Lesser Elemental Slayer -- 13655
 	AddRecipe(13655, 175, nil, Q.UNCOMMON, V.ORIG, 175, 195, 215, 235)
 	self:AddRecipeFlags(13655, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeAcquire(13655, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13655, 2)

 	-- Enchant Cloak - Fire Resistance -- 13657
 	AddRecipe(13657, 175, nil, Q.COMMON, V.ORIG, 175, 195, 215, 235)
 	self:AddRecipeFlags(13657, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeTrainer(13657, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13657, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Shield - Spirit -- 13659
 	AddRecipe(13659, 180, nil, Q.COMMON, V.ORIG, 180, 200, 220, 240)
 	self:AddRecipeFlags(13659, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.SHIELD)
-	self:AddRecipeTrainer(13659, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13659, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Bracer - Strength -- 13661
 	AddRecipe(13661, 180, nil, Q.COMMON, V.ORIG, 180, 200, 220, 240)
 	self:AddRecipeFlags(13661, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(13661, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13661, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Chest - Greater Mana -- 13663
 	AddRecipe(13663, 185, nil, Q.COMMON, V.ORIG, 185, 205, 225, 245)
 	self:AddRecipeFlags(13663, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13663, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13663, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Boots - Lesser Spirit -- 13687
 	AddRecipe(13687, 190, nil, Q.UNCOMMON, V.ORIG, 190, 210, 230, 250)
 	self:AddRecipeFlags(13687, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(13687, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13687, 2)

 	-- Enchant Shield - Lesser Block -- 13689
 	AddRecipe(13689, 195, nil, Q.UNCOMMON, V.ORIG, 195, 215, 235, 255)
 	self:AddRecipeFlags(13689, F.ALLIANCE, F.HORDE, F.INSTANCE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.SHIELD)
-	self:AddRecipeAcquire(13689, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13689, 2)

 	-- Enchant Weapon - Striking -- 13693
 	AddRecipe(13693, 195, nil, Q.COMMON, V.ORIG, 195, 215, 235, 255)
 	self:AddRecipeFlags(13693, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeTrainer(13693, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13693, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant 2H Weapon - Impact -- 13695
 	AddRecipe(13695, 200, nil, Q.COMMON, V.ORIG, 200, 220, 240, 260)
 	self:AddRecipeFlags(13695, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.TWO_HAND)
-	self:AddRecipeTrainer(13695, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13695, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Gloves - Skinning -- 13698
 	AddRecipe(13698, 200, nil, Q.UNCOMMON, V.ORIG, 200, 220, 240, 260)
@@ -364,42 +364,42 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Lesser Stats -- 13700
 	AddRecipe(13700, 200, nil, Q.COMMON, V.ORIG, 200, 220, 240, 260)
 	self:AddRecipeFlags(13700, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13700, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13700, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Runed Truesilver Rod -- 13702
 	AddRecipe(13702, 200, 11145, Q.COMMON, V.ORIG, 200, 220, 240, 260)
 	self:AddRecipeFlags(13702, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(13702, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13702, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Cloak - Greater Defense -- 13746
 	AddRecipe(13746, 205, nil, Q.COMMON, V.ORIG, 205, 225, 245, 265)
 	self:AddRecipeFlags(13746, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.TANK, F.CLOAK)
-	self:AddRecipeTrainer(13746, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13746, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Cloak - Resistance -- 13794
 	AddRecipe(13794, 205, nil, Q.COMMON, V.ORIG, 205, 225, 245, 265)
 	self:AddRecipeFlags(13794, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeTrainer(13794, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13794, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Gloves - Agility -- 13815
 	AddRecipe(13815, 210, nil, Q.COMMON, V.ORIG, 210, 230, 250, 270)
 	self:AddRecipeFlags(13815, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(13815, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13815, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Shield - Stamina -- 13817
 	AddRecipe(13817, 210, nil, Q.UNCOMMON, V.ORIG, 210, 230, 250, 270)
 	self:AddRecipeFlags(13817, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.SHIELD)
-	self:AddRecipeAcquire(13817, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13817, 2)

 	-- Enchant Bracer - Intellect -- 13822
 	AddRecipe(13822, 210, nil, Q.COMMON, V.ORIG, 210, 230, 250, 270)
 	self:AddRecipeFlags(13822, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13822, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13822, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Boots - Stamina -- 13836
 	AddRecipe(13836, 215, nil, Q.COMMON, V.ORIG, 215, 235, 255, 275)
 	self:AddRecipeFlags(13836, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13836, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13836, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Gloves - Advanced Mining -- 13841
 	AddRecipe(13841, 215, nil, Q.UNCOMMON, V.ORIG, 215, 235, 255, 275)
@@ -409,12 +409,12 @@ function addon:InitEnchanting()
 	-- Enchant Bracer - Greater Spirit -- 13846
 	AddRecipe(13846, 220, nil, Q.UNCOMMON, V.ORIG, 220, 240, 260, 280)
 	self:AddRecipeFlags(13846, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(13846, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13846, 2)

 	-- Enchant Chest - Superior Health -- 13858
 	AddRecipe(13858, 220, nil, Q.COMMON, V.ORIG, 220, 240, 260, 280)
 	self:AddRecipeFlags(13858, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13858, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13858, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Gloves - Advanced Herbalism -- 13868
 	AddRecipe(13868, 225, nil, Q.UNCOMMON, V.ORIG, 225, 245, 265, 285)
@@ -429,12 +429,12 @@ function addon:InitEnchanting()
 	-- Enchant Gloves - Strength -- 13887
 	AddRecipe(13887, 225, nil, Q.COMMON, V.ORIG, 225, 245, 265, 285)
 	self:AddRecipeFlags(13887, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(13887, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13887, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Boots - Minor Speed -- 13890
 	AddRecipe(13890, 225, nil, Q.COMMON, V.ORIG, 225, 245, 265, 285)
 	self:AddRecipeFlags(13890, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13890, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13890, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Weapon - Fiery Weapon -- 13898
 	AddRecipe(13898, 265, nil, Q.UNCOMMON, V.ORIG, 265, 285, 305, 325)
@@ -444,17 +444,17 @@ function addon:InitEnchanting()
 	-- Enchant Shield - Greater Spirit -- 13905
 	AddRecipe(13905, 230, nil, Q.COMMON, V.ORIG, 230, 250, 270, 290)
 	self:AddRecipeFlags(13905, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.SHIELD)
-	self:AddRecipeTrainer(13905, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13905, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Weapon - Demonslaying -- 13915
 	AddRecipe(13915, 230, nil, Q.UNCOMMON, V.ORIG, 230, 250, 270, 290)
 	self:AddRecipeFlags(13915, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeAcquire(13915, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13915, 2)

 	-- Enchant Chest - Superior Mana -- 13917
 	AddRecipe(13917, 230, nil, Q.COMMON, V.ORIG, 230, 250, 270, 290)
 	self:AddRecipeFlags(13917, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13917, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13917, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Bracer - Deflection -- 13931
 	AddRecipe(13931, 235, nil, Q.UNCOMMON, V.ORIG, 235, 255, 275, 295)
@@ -464,67 +464,67 @@ function addon:InitEnchanting()
 	-- Enchant Shield - Frost Resistance -- 13933
 	AddRecipe(13933, 235, nil, Q.UNCOMMON, V.ORIG, 235, 255, 275, 295)
 	self:AddRecipeFlags(13933, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.SHIELD)
-	self:AddRecipeAcquire(13933, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13933, 2)

 	-- Enchant Boots - Agility -- 13935
 	AddRecipe(13935, 235, nil, Q.COMMON, V.ORIG, 235, 255, 275, 295)
 	self:AddRecipeFlags(13935, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(13935, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13935, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant 2H Weapon - Greater Impact -- 13937
 	AddRecipe(13937, 240, nil, Q.COMMON, V.ORIG, 240, 260, 280, 300)
 	self:AddRecipeFlags(13937, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.TWO_HAND)
-	self:AddRecipeTrainer(13937, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(13937, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Enchant Bracer - Greater Strength -- 13939
 	AddRecipe(13939, 240, nil, Q.COMMON, V.ORIG, 240, 260, 280, 300)
 	self:AddRecipeFlags(13939, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(13939, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13939, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Chest - Stats -- 13941
 	AddRecipe(13941, 245, nil, Q.COMMON, V.ORIG, 245, 265, 285, 305)
 	self:AddRecipeFlags(13941, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13941, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13941, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Weapon - Greater Striking -- 13943
 	AddRecipe(13943, 245, nil, Q.COMMON, V.ORIG, 245, 265, 285, 305)
 	self:AddRecipeFlags(13943, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeTrainer(13943, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13943, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Bracer - Greater Stamina -- 13945
 	AddRecipe(13945, 245, nil, Q.UNCOMMON, V.ORIG, 245, 265, 285, 305)
 	self:AddRecipeFlags(13945, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(13945, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13945, 2)

 	-- Enchant Gloves - Riding Skill -- 13947
 	AddRecipe(13947, 250, nil, Q.UNCOMMON, V.ORIG, 250, 270, 290, 310)
 	self:AddRecipeFlags(13947, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(13947, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(13947, 2)

 	-- Enchant Gloves - Minor Haste -- 13948
 	AddRecipe(13948, 250, nil, Q.COMMON, V.ORIG, 250, 270, 290, 310)
 	self:AddRecipeFlags(13948, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(13948, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(13948, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Lesser Magic Wand -- 14293
 	AddRecipe(14293, 10, 11287, Q.COMMON, V.ORIG, 10, 75, 95, 115)
 	self:AddRecipeFlags(14293, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.WAND)
-	self:AddRecipeTrainer(14293, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(14293, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Greater Magic Wand -- 14807
 	AddRecipe(14807, 70, 11288, Q.COMMON, V.ORIG, 70, 110, 130, 150)
 	self:AddRecipeFlags(14807, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.WAND)
-	self:AddRecipeTrainer(14807, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(14807, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Lesser Mystic Wand -- 14809
 	AddRecipe(14809, 155, 11289, Q.COMMON, V.ORIG, 155, 175, 195, 215)
 	self:AddRecipeFlags(14809, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.WAND)
-	self:AddRecipeTrainer(14809, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(14809, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Greater Mystic Wand -- 14810
 	AddRecipe(14810, 175, 11290, Q.COMMON, V.ORIG, 175, 195, 215, 235)
 	self:AddRecipeFlags(14810, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.WAND)
-	self:AddRecipeTrainer(14810, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(14810, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Smoking Heart of the Mountain -- 15596
 	AddRecipe(15596, 265, 45050, Q.UNCOMMON, V.ORIG, 265, 285, 305, 325)
@@ -534,22 +534,22 @@ function addon:InitEnchanting()
 	-- Enchanted Thorium -- 17180
 	AddRecipe(17180, 250, 12655, Q.COMMON, V.ORIG, 250, 250, 255, 260)
 	self:AddRecipeFlags(17180, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(17180, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(17180, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchanted Leather -- 17181
 	AddRecipe(17181, 250, 12810, Q.COMMON, V.ORIG, 250, 250, 255, 260)
 	self:AddRecipeFlags(17181, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(17181, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(17181, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Bracer - Greater Intellect -- 20008
 	AddRecipe(20008, 255, nil, Q.COMMON, V.ORIG, 255, 275, 295, 315)
 	self:AddRecipeFlags(20008, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(20008, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(20008, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Bracer - Superior Spirit -- 20009
 	AddRecipe(20009, 270, nil, Q.UNCOMMON, V.ORIG, 270, 290, 310, 330)
 	self:AddRecipeFlags(20009, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(20009, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(20009, 2)

 	-- Enchant Bracer - Superior Strength -- 20010
 	AddRecipe(20010, 295, nil, Q.UNCOMMON, V.ORIG, 295, 310, 325, 340)
@@ -559,22 +559,22 @@ function addon:InitEnchanting()
 	-- Enchant Bracer - Superior Stamina -- 20011
 	AddRecipe(20011, 300, nil, Q.UNCOMMON, V.ORIG, 300, 310, 325, 340)
 	self:AddRecipeFlags(20011, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(20011, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(20011, 2)

 	-- Enchant Gloves - Greater Agility -- 20012
 	AddRecipe(20012, 270, nil, Q.UNCOMMON, V.ORIG, 270, 290, 310, 330)
 	self:AddRecipeFlags(20012, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(20012, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(20012, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Gloves - Greater Strength -- 20013
 	AddRecipe(20013, 295, nil, Q.COMMON, V.ORIG, 295, 310, 325, 340)
 	self:AddRecipeFlags(20013, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(20013, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(20013, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Cloak - Greater Resistance -- 20014
 	AddRecipe(20014, 265, nil, Q.UNCOMMON, V.ORIG, 265, 285, 305, 325)
 	self:AddRecipeFlags(20014, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeTrainer(20014, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(20014, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Cloak - Superior Defense -- 20015
 	AddRecipe(20015, 285, nil, Q.COMMON, V.ORIG, 285, 300, 317, 335)
@@ -584,7 +584,7 @@ function addon:InitEnchanting()
 	-- Enchant Shield - Vitality -- 20016
 	AddRecipe(20016, 280, nil, Q.UNCOMMON, V.ORIG, 280, 300, 320, 340)
 	self:AddRecipeFlags(20016, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.SHIELD)
-	self:AddRecipeTrainer(20016, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(20016, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Shield - Greater Stamina -- 20017
 	AddRecipe(20017, 265, nil, Q.COMMON, V.ORIG, 265, 285, 305, 325)
@@ -594,22 +594,22 @@ function addon:InitEnchanting()
 	-- Enchant Boots - Greater Stamina -- 20020
 	AddRecipe(20020, 260, nil, Q.UNCOMMON, V.ORIG, 260, 280, 300, 320)
 	self:AddRecipeFlags(20020, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(20020, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(20020, 2)

 	-- Enchant Boots - Greater Agility -- 20023
 	AddRecipe(20023, 295, nil, Q.UNCOMMON, V.ORIG, 295, 310, 325, 340)
 	self:AddRecipeFlags(20023, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeTrainer(20023, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(20023, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Boots - Spirit -- 20024
 	AddRecipe(20024, 275, nil, Q.UNCOMMON, V.ORIG, 275, 295, 315, 335)
 	self:AddRecipeFlags(20024, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(20024, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(20024, 2)

 	-- Enchant Chest - Greater Stats -- 20025
 	AddRecipe(20025, 300, nil, Q.UNCOMMON, V.ORIG, 300, 310, 325, 340)
 	self:AddRecipeFlags(20025, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(20025, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(20025, 2)

 	-- Enchant Chest - Major Health -- 20026
 	AddRecipe(20026, 275, nil, Q.COMMON, V.ORIG, 275, 295, 315, 335)
@@ -619,7 +619,7 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Major Mana -- 20028
 	AddRecipe(20028, 290, nil, Q.UNCOMMON, V.ORIG, 290, 305, 322, 340)
 	self:AddRecipeFlags(20028, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(20028, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 16160, 5695, 33676, 4213, 4616, 3011, 3345, 7949, 1317)
+	self:AddRecipeTrainer(20028, 3606, 19540, 11072, 11073, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 33610, 1317, 16160, 33676, 4213, 3345, 3011, 4616, 7949, 5695)

 	-- Enchant Weapon - Icy Chill -- 20029
 	AddRecipe(20029, 285, nil, Q.UNCOMMON, V.ORIG, 285, 300, 317, 335)
@@ -775,17 +775,17 @@ function addon:InitEnchanting()
 	-- Minor Wizard Oil -- 25124
 	AddRecipe(25124, 45, 20744, Q.COMMON, V.ORIG, 45, 55, 65, 75)
 	self:AddRecipeFlags(25124, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(25124, 28714, 15419, 4617, 18951, 5757, 16722, 18753, 19234, 3012, 5758, 26569, 18773, 27147, 5158, 19540, 27030, 3346, 1318, 19663, 27054, 19537, 16635, 4228)
+	self:AddRecipeVendor(25124, 28714, 15419, 4617, 18951, 5757, 16722, 27030, 19234, 3012, 5758, 26569, 18773, 4228, 5158, 16635, 19663, 3346, 1318, 27054, 27147, 19537, 18753, 19540)

 	-- Minor Mana Oil -- 25125
 	AddRecipe(25125, 150, 20745, Q.COMMON, V.ORIG, 150, 160, 170, 180)
 	self:AddRecipeFlags(25125, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(25125, 28714, 15419, 4617, 18951, 5757, 16722, 18753, 19234, 3012, 5758, 26569, 18773, 27147, 5158, 19540, 27030, 3346, 1318, 19663, 27054, 19537, 16635, 4228)
+	self:AddRecipeVendor(25125, 28714, 15419, 4617, 18951, 5757, 16722, 27030, 19234, 3012, 5758, 26569, 18773, 4228, 5158, 16635, 19663, 3346, 1318, 27054, 27147, 19537, 18753, 19540)

 	-- Lesser Wizard Oil -- 25126
 	AddRecipe(25126, 200, 20746, Q.COMMON, V.ORIG, 200, 210, 220, 230)
 	self:AddRecipeFlags(25126, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(25126, 28714, 15419, 4617, 18951, 5757, 16722, 18753, 19234, 3012, 5758, 26569, 18773, 27147, 5158, 19540, 27030, 3346, 1318, 19663, 27054, 19537, 16635, 4228)
+	self:AddRecipeVendor(25126, 28714, 15419, 4617, 18951, 5757, 16722, 27030, 19234, 3012, 5758, 26569, 18773, 4228, 5158, 16635, 19663, 3346, 1318, 27054, 27147, 19537, 18753, 19540)

 	-- Lesser Mana Oil -- 25127
 	AddRecipe(25127, 250, 20747, Q.COMMON, V.ORIG, 250, 260, 270, 280)
@@ -836,7 +836,7 @@ function addon:InitEnchanting()
 	-- Enchant Bracer - Restore Mana Prime -- 27913
 	AddRecipe(27913, 335, nil, Q.UNCOMMON, V.TBC, 335, 345, 360, 375)
 	self:AddRecipeFlags(27913, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(27913, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(27913, 2)

 	-- Enchant Bracer - Fortitude -- 27914
 	AddRecipe(27914, 350, nil, Q.UNCOMMON, V.TBC, 350, 370, 375, 380)
@@ -881,12 +881,12 @@ function addon:InitEnchanting()
 	-- Enchant Shield - Shield Block -- 27946
 	AddRecipe(27946, 340, nil, Q.UNCOMMON, V.TBC, 340, 350, 365, 380)
 	self:AddRecipeFlags(27946, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.SHIELD)
-	self:AddRecipeAcquire(27946, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(27946, 2)

 	-- Enchant Shield - Resistance -- 27947
 	AddRecipe(27947, 360, nil, Q.UNCOMMON, V.TBC, 360, 370, 375, 380)
 	self:AddRecipeFlags(27947, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.SHIELD)
-	self:AddRecipeAcquire(27947, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(27947, 2)

 	-- Enchant Boots - Vitality -- 27948
 	AddRecipe(27948, 305, nil, Q.COMMON, V.TBC, 305, 315, 330, 345)
@@ -916,7 +916,7 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Exceptional Mana -- 27958
 	AddRecipe(27958, 350, nil, Q.COMMON, V.WOTLK, 350, 360, 370, 380)
 	self:AddRecipeFlags(27958, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(27958, 28693, 26980, 26906, 26954, 26990, 33583)
+	self:AddRecipeTrainer(27958, 28693, 26980, 33583, 26954, 26906, 26990)

 	-- Enchant Chest - Exceptional Stats -- 27960
 	AddRecipe(27960, 345, nil, Q.COMMON, V.TBC, 345, 355, 367, 380)
@@ -932,7 +932,7 @@ function addon:InitEnchanting()
 	-- Enchant Cloak - Major Resistance -- 27962
 	AddRecipe(27962, 330, nil, Q.UNCOMMON, V.TBC, 330, 340, 355, 370)
 	self:AddRecipeFlags(27962, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeAcquire(27962, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(27962, 2)

 	-- Enchant Weapon - Major Striking -- 27967
 	AddRecipe(27967, 340, nil, Q.COMMON, V.TBC, 340, 350, 365, 380)
@@ -952,7 +952,7 @@ function addon:InitEnchanting()
 	-- Enchant Weapon - Potency -- 27972
 	AddRecipe(27972, 350, nil, Q.UNCOMMON, V.TBC, 350, 370, 375, 380)
 	self:AddRecipeFlags(27972, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeAcquire(27972, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(27972, 2)

 	-- Enchant Weapon - Major Spellpower -- 27975
 	AddRecipe(27975, 350, nil, Q.UNCOMMON, V.TBC, 350, 370, 375, 380)
@@ -982,12 +982,12 @@ function addon:InitEnchanting()
 	-- Enchant Weapon - Spellsurge -- 28003
 	AddRecipe(28003, 360, nil, Q.UNCOMMON, V.TBC, 360, 370, 377, 385)
 	self:AddRecipeFlags(28003, F.ALLIANCE, F.HORDE, F.INSTANCE, F.RAID, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeAcquire(28003, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(28003, 2)

 	-- Enchant Weapon - Battlemaster -- 28004
 	AddRecipe(28004, 360, nil, Q.UNCOMMON, V.TBC, 360, 370, 377, 385)
 	self:AddRecipeFlags(28004, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeAcquire(28004, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(28004, 2)

 	-- Superior Mana Oil -- 28016
 	AddRecipe(28016, 310, 22521, Q.COMMON, V.TBC, 310, 310, 320, 330)
@@ -1027,7 +1027,7 @@ function addon:InitEnchanting()
 	-- Runed Eternium Rod -- 32667
 	AddRecipe(32667, 375, 22463, Q.COMMON, V.TBC, 375, 375, 377, 385)
 	self:AddRecipeFlags(32667, F.ALLIANCE, F.HORDE, F.TRAINER, F.VENDOR, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(32667, 28693, 26980, 26906, 26954, 26990, 33583)
+	self:AddRecipeTrainer(32667, 28693, 26980, 33583, 26954, 26906, 26990)
 	self:AddRecipeVendor(32667, 19663)

 	-- Enchant Chest - Major Spirit -- 33990
@@ -1043,7 +1043,7 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Major Resilience -- 33992
 	AddRecipe(33992, 345, nil, Q.UNCOMMON, V.TBC, 345, 355, 367, 380)
 	self:AddRecipeFlags(33992, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(33992, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(33992, 2)

 	-- Enchant Gloves - Blasting -- 33993
 	AddRecipe(33993, 305, nil, Q.COMMON, V.TBC, 305, 315, 330, 345)
@@ -1158,22 +1158,22 @@ function addon:InitEnchanting()
 	-- Enchant Gloves - Expertise -- 44484
 	AddRecipe(44484, 405, nil, Q.COMMON, V.WOTLK, 405, 415, 425, 435)
 	self:AddRecipeFlags(44484, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(44484, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44484, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Gloves - Precision -- 44488
 	AddRecipe(44488, 410, nil, Q.COMMON, V.WOTLK, 410, 420, 430, 440)
 	self:AddRecipeFlags(44488, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44488, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44488, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Shield - Defense -- 44489
 	AddRecipe(44489, 420, nil, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(44489, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.SHIELD)
-	self:AddRecipeTrainer(44489, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44489, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Chest - Mighty Health -- 44492
 	AddRecipe(44492, 395, nil, Q.COMMON, V.WOTLK, 395, 405, 415, 425)
 	self:AddRecipeFlags(44492, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44492, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44492, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Cloak - Superior Nature Resistance -- 44494
 	AddRecipe(44494, 400, nil, Q.UNCOMMON, V.WOTLK, 400, 415, 425, 435)
@@ -1183,32 +1183,32 @@ function addon:InitEnchanting()
 	-- Enchant Cloak - Superior Agility -- 44500
 	AddRecipe(44500, 395, nil, Q.COMMON, V.WOTLK, 395, 405, 415, 425)
 	self:AddRecipeFlags(44500, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.CLOAK)
-	self:AddRecipeTrainer(44500, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44500, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Gloves - Gatherer -- 44506
 	AddRecipe(44506, 375, nil, Q.COMMON, V.WOTLK, 375, 375, 380, 390)
 	self:AddRecipeFlags(44506, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44506, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44506, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Boots - Greater Spirit -- 44508
 	AddRecipe(44508, 410, nil, Q.COMMON, V.WOTLK, 410, 420, 430, 440)
 	self:AddRecipeFlags(44508, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(44508, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44508, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Chest - Greater Mana Restoration -- 44509
 	AddRecipe(44509, 420, nil, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(44509, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(44509, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44509, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Weapon - Exceptional Spirit -- 44510
 	AddRecipe(44510, 410, nil, Q.COMMON, V.WOTLK, 410, 420, 430, 440)
 	self:AddRecipeFlags(44510, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeTrainer(44510, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44510, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Gloves - Greater Assault -- 44513
 	AddRecipe(44513, 395, nil, Q.COMMON, V.WOTLK, 395, 405, 415, 425)
 	self:AddRecipeFlags(44513, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(44513, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44513, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Weapon - Icebreaker -- 44524
 	AddRecipe(44524, 425, nil, Q.RARE, V.WOTLK, 425, 435, 445, 455)
@@ -1218,17 +1218,17 @@ function addon:InitEnchanting()
 	-- Enchant Boots - Greater Fortitude -- 44528
 	AddRecipe(44528, 385, nil, Q.COMMON, V.WOTLK, 385, 385, 390, 400)
 	self:AddRecipeFlags(44528, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44528, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44528, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Gloves - Major Agility -- 44529
 	AddRecipe(44529, 415, nil, Q.COMMON, V.WOTLK, 415, 425, 435, 445)
 	self:AddRecipeFlags(44529, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(44529, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44529, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Bracers - Exceptional Intellect -- 44555
 	AddRecipe(44555, 375, nil, Q.COMMON, V.WOTLK, 375, 385, 392, 400)
 	self:AddRecipeFlags(44555, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44555, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44555, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Cloak - Superior Fire Resistance -- 44556
 	AddRecipe(44556, 400, nil, Q.UNCOMMON, V.WOTLK, 400, 415, 425, 435)
@@ -1248,12 +1248,12 @@ function addon:InitEnchanting()
 	-- Enchant Cloak - Spell Piercing -- 44582
 	AddRecipe(44582, 395, nil, Q.COMMON, V.WOTLK, 395, 395, 402, 410)
 	self:AddRecipeFlags(44582, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CASTER, F.CLOAK)
-	self:AddRecipeTrainer(44582, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44582, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Boots - Greater Vitality -- 44584
 	AddRecipe(44584, 405, nil, Q.COMMON, V.WOTLK, 405, 415, 425, 435)
 	self:AddRecipeFlags(44584, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44584, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44584, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Chest - Exceptional Resilience -- 44588
 	AddRecipe(44588, 410, nil, Q.UNCOMMON, V.WOTLK, 410, 435, 445, 455)
@@ -1263,7 +1263,7 @@ function addon:InitEnchanting()
 	-- Enchant Boots - Superior Agility -- 44589
 	AddRecipe(44589, 415, nil, Q.COMMON, V.WOTLK, 415, 425, 435, 445)
 	self:AddRecipeFlags(44589, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(44589, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44589, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Cloak - Superior Shadow Resistance -- 44590
 	AddRecipe(44590, 400, nil, Q.UNCOMMON, V.WOTLK, 400, 415, 425, 435)
@@ -1278,12 +1278,12 @@ function addon:InitEnchanting()
 	-- Enchant Gloves - Exceptional Spellpower -- 44592
 	AddRecipe(44592, 360, nil, Q.COMMON, V.WOTLK, 360, 370, 380, 390)
 	self:AddRecipeFlags(44592, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(44592, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44592, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Bracers - Major Spirit -- 44593
 	AddRecipe(44593, 420, nil, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(44593, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(44593, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44593, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant 2H Weapon - Scourgebane -- 44595
 	AddRecipe(44595, 430, 44473, Q.RARE, V.WOTLK, 430, 440, 450, 460)
@@ -1298,12 +1298,12 @@ function addon:InitEnchanting()
 	-- Enchant Bracers - Expertise -- 44598
 	AddRecipe(44598, 415, nil, Q.COMMON, V.WOTLK, 415, 425, 435, 445)
 	self:AddRecipeFlags(44598, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(44598, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44598, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Bracers - Greater Stats -- 44616
 	AddRecipe(44616, 400, nil, Q.COMMON, V.WOTLK, 400, 410, 420, 430)
 	self:AddRecipeFlags(44616, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44616, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44616, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Weapon - Giant Slayer -- 44621
 	AddRecipe(44621, 430, nil, Q.RARE, V.WOTLK, 430, 440, 450, 460)
@@ -1313,7 +1313,7 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Super Stats -- 44623
 	AddRecipe(44623, 370, nil, Q.COMMON, V.WOTLK, 370, 380, 390, 400)
 	self:AddRecipeFlags(44623, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44623, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44623, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Gloves - Armsman -- 44625
 	AddRecipe(44625, 435, nil, Q.UNCOMMON, V.WOTLK, 435, 445, 455, 465)
@@ -1323,12 +1323,12 @@ function addon:InitEnchanting()
 	-- Enchant Weapon - Exceptional Spellpower -- 44629
 	AddRecipe(44629, 395, nil, Q.COMMON, V.WOTLK, 395, 405, 415, 425)
 	self:AddRecipeFlags(44629, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeTrainer(44629, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44629, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant 2H Weapon - Greater Savagery -- 44630
 	AddRecipe(44630, 390, nil, Q.COMMON, V.WOTLK, 390, 400, 410, 420)
 	self:AddRecipeFlags(44630, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TWO_HAND)
-	self:AddRecipeTrainer(44630, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44630, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Cloak - Shadow Armor -- 44631
 	AddRecipe(44631, 440, nil, Q.UNCOMMON, V.WOTLK, 440, 450, 460, 470)
@@ -1338,22 +1338,22 @@ function addon:InitEnchanting()
 	-- Enchant Weapon - Exceptional Agility -- 44633
 	AddRecipe(44633, 410, nil, Q.COMMON, V.WOTLK, 410, 420, 430, 440)
 	self:AddRecipeFlags(44633, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeTrainer(44633, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44633, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Bracers - Greater Spellpower -- 44635
 	AddRecipe(44635, 395, nil, Q.COMMON, V.WOTLK, 395, 405, 415, 425)
 	self:AddRecipeFlags(44635, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(44635, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44635, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Ring - Greater Spellpower -- 44636
 	AddRecipe(44636, 400, nil, Q.COMMON, V.WOTLK, 400, 400, 407, 415)
 	self:AddRecipeFlags(44636, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(44636, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44636, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Ring - Assault -- 44645
 	AddRecipe(44645, 400, nil, Q.COMMON, V.WOTLK, 400, 400, 407, 415)
 	self:AddRecipeFlags(44645, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(44645, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(44645, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Void Shatter -- 45765
 	AddRecipe(45765, 375, 22449, Q.COMMON, V.TBC, 375, 375, 375, 375)
@@ -1383,7 +1383,7 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Greater Defense -- 47766
 	AddRecipe(47766, 400, nil, Q.COMMON, V.WOTLK, 400, 410, 420, 430)
 	self:AddRecipeFlags(47766, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeTrainer(47766, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(47766, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Cloak - Greater Speed -- 47898
 	AddRecipe(47898, 430, nil, Q.UNCOMMON, V.WOTLK, 430, 440, 450, 460)
@@ -1398,7 +1398,7 @@ function addon:InitEnchanting()
 	-- Enchant Chest - Super Health -- 47900
 	AddRecipe(47900, 425, nil, Q.COMMON, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(47900, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(47900, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(47900, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Boots - Tuskarr's Vitality -- 47901
 	AddRecipe(47901, 440, nil, Q.UNCOMMON, V.WOTLK, 440, 450, 460, 470)
@@ -1423,52 +1423,52 @@ function addon:InitEnchanting()
 	-- Enchant Ring - Stamina -- 59636
 	AddRecipe(59636, 400, nil, Q.COMMON, V.WOTLK, 400, 400, 407, 415)
 	self:AddRecipeFlags(59636, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(59636, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(59636, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Boots - Assault -- 60606
 	AddRecipe(60606, 375, nil, Q.COMMON, V.WOTLK, 375, 385, 395, 405)
 	self:AddRecipeFlags(60606, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(60606, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60606, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Cloak - Speed -- 60609
 	AddRecipe(60609, 350, nil, Q.COMMON, V.WOTLK, 350, 360, 370, 380)
 	self:AddRecipeFlags(60609, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOAK)
-	self:AddRecipeTrainer(60609, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60609, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Bracers - Striking -- 60616
 	AddRecipe(60616, 360, nil, Q.COMMON, V.WOTLK, 360, 370, 380, 390)
 	self:AddRecipeFlags(60616, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(60616, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60616, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Runed Titanium Rod -- 60619
 	AddRecipe(60619, 425, 44452, Q.RARE, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(60619, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(60619, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60619, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Weapon - Greater Potency -- 60621
 	AddRecipe(60621, 380, nil, Q.COMMON, V.WOTLK, 380, 390, 400, 410)
 	self:AddRecipeFlags(60621, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.ONE_HAND, F.TWO_HAND)
-	self:AddRecipeTrainer(60621, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60621, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Boots - Icewalker -- 60623
 	AddRecipe(60623, 385, nil, Q.COMMON, V.WOTLK, 385, 395, 405, 415)
 	self:AddRecipeFlags(60623, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(60623, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60623, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Shield - Greater Intellect -- 60653
 	AddRecipe(60653, 395, nil, Q.COMMON, V.WOTLK, 395, 405, 415, 425)
 	self:AddRecipeFlags(60653, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.SHIELD)
-	self:AddRecipeTrainer(60653, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60653, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Cloak - Major Agility -- 60663
 	AddRecipe(60663, 420, nil, Q.COMMON, V.WOTLK, 420, 430, 440, 450)
 	self:AddRecipeFlags(60663, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.CLOAK)
-	self:AddRecipeTrainer(60663, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60663, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Gloves - Crusher -- 60668
 	AddRecipe(60668, 425, nil, Q.COMMON, V.WOTLK, 425, 435, 445, 455)
 	self:AddRecipeFlags(60668, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(60668, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(60668, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant 2H Weapon - Massacre -- 60691
 	AddRecipe(60691, 430, nil, Q.RARE, V.WOTLK, 430, 440, 450, 460)
@@ -1513,12 +1513,12 @@ function addon:InitEnchanting()
 	-- Enchant Staff - Spellpower -- 62959
 	AddRecipe(62959, 385, nil, Q.COMMON, V.WOTLK, 385, 395, 405, 415)
 	self:AddRecipeFlags(62959, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.STAFF)
-	self:AddRecipeTrainer(62959, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(62959, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Boots - Lesser Accuracy -- 63746
 	AddRecipe(63746, 225, nil, Q.COMMON, V.WOTLK, 225, 245, 265, 285)
 	self:AddRecipeFlags(63746, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(63746, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 11073, 33676, 1317, 4213, 33610, 3011, 3345, 7949, 4616)
+	self:AddRecipeTrainer(63746, 3606, 19540, 11072, 5695, 18753, 11074, 5157, 19251, 16725, 19252, 16633, 18773, 16160, 4616, 11073, 33676, 4213, 3345, 3011, 33610, 7949, 1317)

 	-- Enchant Weapon - Blade Ward -- 64441
 	AddRecipe(64441, 450, nil, Q.EPIC, V.WOTLK, 450, 455, 460, 465)
@@ -1533,7 +1533,7 @@ function addon:InitEnchanting()
 	-- Abyssal Shatter -- 69412
 	AddRecipe(69412, 445, 49640, Q.COMMON, V.WOTLK, 445, 445, 447, 450)
 	self:AddRecipeFlags(69412, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(69412, 28693, 26980, 33583, 26954, 26906, 26990)
+	self:AddRecipeTrainer(69412, 28693, 33583, 26990, 26954, 26906, 26980)

 	-- Enchant Gloves - Angler -- 71692
 	AddRecipe(71692, 375, nil, Q.UNCOMMON, V.WOTLK, 375, 385, 392, 400)
diff --git a/Database/Engineering.lua b/Database/Engineering.lua
index e3df93f..dadb9c9 100644
--- a/Database/Engineering.lua
+++ b/Database/Engineering.lua
@@ -68,77 +68,77 @@ function addon:InitEngineering()
 	-- Handful of Copper Bolts -- 3922
 	AddRecipe(3922, 30, 4359, Q.COMMON, V.ORIG, 30, 45, 52, 60)
 	self:AddRecipeFlags(3922, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3922, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3922, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 33634)

 	-- Rough Copper Bomb -- 3923
 	AddRecipe(3923, 30, 4360, Q.COMMON, V.ORIG, 30, 60, 75, 90)
 	self:AddRecipeFlags(3923, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3923, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3923, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Copper Tube -- 3924
 	AddRecipe(3924, 50, 4361, Q.COMMON, V.ORIG, 50, 80, 95, 110)
 	self:AddRecipeFlags(3924, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3924, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3924, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Rough Boomstick -- 3925
 	AddRecipe(3925, 50, 4362, Q.COMMON, V.ORIG, 50, 80, 95, 110)
 	self:AddRecipeFlags(3925, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.GUN)
-	self:AddRecipeTrainer(3925, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3925, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Copper Modulator -- 3926
 	AddRecipe(3926, 65, 4363, Q.COMMON, V.ORIG, 65, 95, 110, 125)
 	self:AddRecipeFlags(3926, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3926, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3926, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Mechanical Squirrel Box -- 3928
 	AddRecipe(3928, 75, 4401, Q.UNCOMMON, V.ORIG, 75, 105, 120, 135)
 	self:AddRecipeFlags(3928, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3928, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3928, 2)

 	-- Coarse Blasting Powder -- 3929
 	AddRecipe(3929, 75, 4364, Q.COMMON, V.ORIG, 75, 85, 90, 95)
 	self:AddRecipeFlags(3929, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3929, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3929, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Crafted Heavy Shot -- 3930
 	AddRecipe(3930, 75, 8068, Q.COMMON, V.ORIG, 75, 85, 90, 95)
 	self:AddRecipeFlags(3930, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(3930, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3930, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Coarse Dynamite -- 3931
 	AddRecipe(3931, 75, 4365, Q.COMMON, V.ORIG, 75, 90, 97, 105)
 	self:AddRecipeFlags(3931, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3931, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3931, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Target Dummy -- 3932
 	AddRecipe(3932, 85, 4366, Q.COMMON, V.ORIG, 85, 115, 130, 145)
 	self:AddRecipeFlags(3932, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3932, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 16667, 26991, 5174, 11031, 33586, 3290, 18775, 28697)
+	self:AddRecipeTrainer(3932, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 28697, 17222, 5518, 11037, 18775, 33611, 8736, 16667, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Small Seaforium Charge -- 3933
 	AddRecipe(3933, 100, 4367, Q.UNCOMMON, V.ORIG, 100, 130, 145, 160)
 	self:AddRecipeFlags(3933, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3933, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3933, 2)

 	-- Flying Tiger Goggles -- 3934
 	AddRecipe(3934, 100, 4368, Q.COMMON, V.ORIG, 100, 130, 145, 160)
 	self:AddRecipeFlags(3934, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3934, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 16667, 26991, 5174, 11031, 33586, 3290, 18775, 28697)
+	self:AddRecipeTrainer(3934, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 28697, 17222, 5518, 11037, 18775, 33611, 8736, 16667, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Deadly Blunderbuss -- 3936
 	AddRecipe(3936, 105, 4369, Q.COMMON, V.ORIG, 105, 130, 142, 155)
 	self:AddRecipeFlags(3936, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.GUN)
-	self:AddRecipeTrainer(3936, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3936, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Large Copper Bomb -- 3937
 	AddRecipe(3937, 105, 4370, Q.COMMON, V.ORIG, 105, 105, 130, 155)
 	self:AddRecipeFlags(3937, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3937, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3937, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Bronze Tube -- 3938
 	AddRecipe(3938, 105, 4371, Q.COMMON, V.ORIG, 105, 105, 130, 155)
 	self:AddRecipeFlags(3938, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3938, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3938, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Lovingly Crafted Boomstick -- 3939
 	AddRecipe(3939, 120, 4372, Q.COMMON, V.ORIG, 120, 145, 157, 170)
@@ -148,17 +148,17 @@ function addon:InitEngineering()
 	-- Shadow Goggles -- 3940
 	AddRecipe(3940, 120, 4373, Q.UNCOMMON, V.ORIG, 120, 145, 157, 170)
 	self:AddRecipeFlags(3940, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3940, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3940, 2)

 	-- Small Bronze Bomb -- 3941
 	AddRecipe(3941, 120, 4374, Q.COMMON, V.ORIG, 120, 120, 145, 170)
 	self:AddRecipeFlags(3941, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3941, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3941, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Whirring Bronze Gizmo -- 3942
 	AddRecipe(3942, 125, 4375, Q.COMMON, V.ORIG, 125, 125, 150, 175)
 	self:AddRecipeFlags(3942, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3942, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3942, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Flame Deflector -- 3944
 	AddRecipe(3944, 125, 4376, Q.UNCOMMON, V.ORIG, 125, 125, 150, 175)
@@ -168,27 +168,27 @@ function addon:InitEngineering()
 	-- Heavy Blasting Powder -- 3945
 	AddRecipe(3945, 125, 4377, Q.COMMON, V.ORIG, 125, 125, 135, 145)
 	self:AddRecipeFlags(3945, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3945, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3945, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Heavy Dynamite -- 3946
 	AddRecipe(3946, 125, 4378, Q.COMMON, V.ORIG, 125, 125, 135, 145)
 	self:AddRecipeFlags(3946, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3946, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3946, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Crafted Solid Shot -- 3947
 	AddRecipe(3947, 125, 8069, Q.COMMON, V.ORIG, 125, 125, 135, 145)
 	self:AddRecipeFlags(3947, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(3947, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3947, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Silver-plated Shotgun -- 3949
 	AddRecipe(3949, 130, 4379, Q.COMMON, V.ORIG, 130, 155, 167, 180)
 	self:AddRecipeFlags(3949, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.GUN)
-	self:AddRecipeTrainer(3949, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3949, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Big Bronze Bomb -- 3950
 	AddRecipe(3950, 140, 4380, Q.COMMON, V.ORIG, 140, 140, 165, 190)
 	self:AddRecipeFlags(3950, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3950, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3950, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Minor Recombobulator -- 3952
 	AddRecipe(3952, 140, 4381, Q.COMMON, V.ORIG, 140, 165, 177, 190)
@@ -198,22 +198,22 @@ function addon:InitEngineering()
 	-- Bronze Framework -- 3953
 	AddRecipe(3953, 145, 4382, Q.COMMON, V.ORIG, 145, 145, 170, 195)
 	self:AddRecipeFlags(3953, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3953, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3953, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Moonsight Rifle -- 3954
 	AddRecipe(3954, 145, 4383, Q.UNCOMMON, V.ORIG, 145, 170, 182, 195)
 	self:AddRecipeFlags(3954, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.GUN)
-	self:AddRecipeAcquire(3954, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3954, 2)

 	-- Explosive Sheep -- 3955
 	AddRecipe(3955, 150, 4384, Q.COMMON, V.ORIG, 150, 175, 187, 200)
 	self:AddRecipeFlags(3955, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3955, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3955, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Green Tinted Goggles -- 3956
 	AddRecipe(3956, 150, 4385, Q.COMMON, V.ORIG, 150, 175, 187, 200)
 	self:AddRecipeFlags(3956, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3956, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3956, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Ice Deflector -- 3957
 	AddRecipe(3957, 155, 4386, Q.COMMON, V.ORIG, 155, 175, 185, 195)
@@ -223,7 +223,7 @@ function addon:InitEngineering()
 	-- Iron Strut -- 3958
 	AddRecipe(3958, 160, 4387, Q.COMMON, V.ORIG, 160, 160, 170, 180)
 	self:AddRecipeFlags(3958, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3958, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(3958, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Discombobulator Ray -- 3959
 	AddRecipe(3959, 160, 4388, Q.UNCOMMON, V.ORIG, 160, 180, 190, 200)
@@ -233,42 +233,42 @@ function addon:InitEngineering()
 	-- Portable Bronze Mortar -- 3960
 	AddRecipe(3960, 165, 4403, Q.UNCOMMON, V.ORIG, 165, 185, 195, 210)
 	self:AddRecipeFlags(3960, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3960, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3960, 2)

 	-- Gyrochronatom -- 3961
 	AddRecipe(3961, 170, 4389, Q.COMMON, V.ORIG, 170, 170, 190, 210)
 	self:AddRecipeFlags(3961, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3961, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(3961, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Iron Grenade -- 3962
 	AddRecipe(3962, 175, 4390, Q.COMMON, V.ORIG, 175, 175, 195, 215)
 	self:AddRecipeFlags(3962, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3962, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(3962, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Compact Harvest Reaper Kit -- 3963
 	AddRecipe(3963, 175, 4391, Q.COMMON, V.ORIG, 175, 175, 195, 215)
 	self:AddRecipeFlags(3963, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3963, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(3963, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Advanced Target Dummy -- 3965
 	AddRecipe(3965, 185, 4392, Q.COMMON, V.ORIG, 185, 185, 205, 225)
 	self:AddRecipeFlags(3965, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3965, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(3965, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Craftsman's Monocle -- 3966
 	AddRecipe(3966, 185, 4393, Q.RARE, V.ORIG, 185, 205, 215, 225)
 	self:AddRecipeFlags(3966, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(3966, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(3966, 3)

 	-- Big Iron Bomb -- 3967
 	AddRecipe(3967, 190, 4394, Q.COMMON, V.ORIG, 190, 190, 210, 230)
 	self:AddRecipeFlags(3967, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3967, 11017, 11025, 17634, 3494, 1702, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(3967, 11017, 11025, 17634, 3494, 1702, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Goblin Land Mine -- 3968
 	AddRecipe(3968, 195, 4395, Q.UNCOMMON, V.ORIG, 195, 215, 225, 235)
 	self:AddRecipeFlags(3968, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3968, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3968, 2)

 	-- Mechanical Dragonling -- 3969
 	AddRecipe(3969, 200, 4396, Q.COMMON, V.ORIG, 200, 220, 230, 240)
@@ -284,22 +284,22 @@ function addon:InitEngineering()
 	-- Large Seaforium Charge -- 3972
 	AddRecipe(3972, 200, 4398, Q.UNCOMMON, V.ORIG, 200, 200, 220, 240)
 	self:AddRecipeFlags(3972, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3972, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3972, 2)

 	-- Silver Contact -- 3973
 	AddRecipe(3973, 90, 4404, Q.COMMON, V.ORIG, 90, 110, 125, 140)
 	self:AddRecipeFlags(3973, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3973, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 16667, 26991, 5174, 11031, 33586, 3290, 18775, 28697)
+	self:AddRecipeTrainer(3973, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 28697, 17222, 5518, 11037, 18775, 33611, 8736, 16667, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Crude Scope -- 3977
 	AddRecipe(3977, 60, 4405, Q.COMMON, V.ORIG, 60, 90, 105, 120)
 	self:AddRecipeFlags(3977, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3977, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(3977, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Standard Scope -- 3978
 	AddRecipe(3978, 110, 4406, Q.COMMON, V.ORIG, 110, 135, 147, 160)
 	self:AddRecipeFlags(3978, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3978, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(3978, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Accurate Scope -- 3979
 	AddRecipe(3979, 180, 4407, Q.COMMON, V.ORIG, 180, 200, 210, 220)
@@ -309,28 +309,28 @@ function addon:InitEngineering()
 	-- Ornate Spyglass -- 6458
 	AddRecipe(6458, 135, 5507, Q.COMMON, V.ORIG, 135, 160, 172, 185)
 	self:AddRecipeFlags(6458, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(6458, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(6458, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Arclight Spanner -- 7430
 	AddRecipe(7430, 50, 6219, Q.COMMON, V.ORIG, 50, 70, 80, 90)
 	self:AddRecipeFlags(7430, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND)
-	self:AddRecipeTrainer(7430, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33634, 16726, 5518, 11037, 26991, 33611, 8736, 18775, 33586, 5174, 11031, 3290, 28697, 16667, 17222)
+	self:AddRecipeTrainer(7430, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 33634, 26955, 17222, 16726, 5518, 11037, 16667, 33611, 8736, 18775, 28697, 26991, 11031, 33586, 3290, 5174, 19576)

 	-- Flash Bomb -- 8243
 	AddRecipe(8243, 185, 4852, Q.UNCOMMON, V.ORIG, 185, 185, 205, 225)
 	self:AddRecipeFlags(8243, F.ALLIANCE, F.HORDE, F.INSTANCE, F.QUEST, F.IBOE, F.RBOE)
 	self:AddRecipeMobDrop(8243, 7800)
-	self:AddRecipeAcquire(8243, A.QUEST, 1559)
+	self:AddRecipeQuest(8243, 1559)

 	-- Practice Lock -- 8334
 	AddRecipe(8334, 100, 6712, Q.COMMON, V.ORIG, 100, 115, 122, 130)
 	self:AddRecipeFlags(8334, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(8334, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 16667, 26991, 5174, 11031, 33586, 3290, 18775, 28697)
+	self:AddRecipeTrainer(8334, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 28697, 17222, 5518, 11037, 18775, 33611, 8736, 16667, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- EZ-Thro Dynamite -- 8339
 	AddRecipe(8339, 100, 6714, Q.UNCOMMON, V.ORIG, 100, 115, 122, 130)
 	self:AddRecipeFlags(8339, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(8339, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(8339, 2)

 	-- Goblin Rocket Boots -- 8895
 	AddRecipe(8895, 225, 7189, Q.COMMON, V.ORIG, 225, 245, 255, 265, 20222)
@@ -346,7 +346,7 @@ function addon:InitEngineering()
 	-- Aquadynamic Fish Attractor -- 9271
 	AddRecipe(9271, 150, 6533, Q.COMMON, V.ORIG, 150, 150, 160, 170)
 	self:AddRecipeFlags(9271, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(9271, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(9271, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Goblin Jumper Cables -- 9273
 	AddRecipe(9273, 165, 7148, Q.COMMON, V.ORIG, 165, 165, 180, 200)
@@ -357,52 +357,52 @@ function addon:InitEngineering()
 	-- Gold Power Core -- 12584
 	AddRecipe(12584, 150, 10558, Q.COMMON, V.ORIG, 150, 150, 170, 190)
 	self:AddRecipeFlags(12584, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12584, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 33634, 33611, 8736, 18775, 26991, 5174, 11031, 33586, 3290, 28697, 16667)
+	self:AddRecipeTrainer(12584, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 16667, 17222, 5518, 11037, 28697, 33611, 8736, 18775, 3290, 26991, 11031, 33586, 5174, 33634, 16726)

 	-- Solid Blasting Powder -- 12585
 	AddRecipe(12585, 175, 10505, Q.COMMON, V.ORIG, 175, 175, 185, 195)
 	self:AddRecipeFlags(12585, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12585, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12585, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Solid Dynamite -- 12586
 	AddRecipe(12586, 175, 10507, Q.COMMON, V.ORIG, 175, 175, 185, 195)
 	self:AddRecipeFlags(12586, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12586, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12586, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Bright-Eye Goggles -- 12587
 	AddRecipe(12587, 175, 10499, Q.UNCOMMON, V.ORIG, 175, 195, 205, 215)
 	self:AddRecipeFlags(12587, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(12587, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12587, 2)

 	-- Mithril Tube -- 12589
 	AddRecipe(12589, 195, 10559, Q.COMMON, V.ORIG, 195, 195, 215, 235)
 	self:AddRecipeFlags(12589, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12589, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12589, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Gyromatic Micro-Adjustor -- 12590
 	AddRecipe(12590, 175, 10498, Q.COMMON, V.ORIG, 175, 175, 195, 215)
 	self:AddRecipeFlags(12590, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12590, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12590, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Unstable Trigger -- 12591
 	AddRecipe(12591, 200, 10560, Q.COMMON, V.ORIG, 200, 200, 220, 240)
 	self:AddRecipeFlags(12591, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12591, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12591, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Fire Goggles -- 12594
 	AddRecipe(12594, 205, 10500, Q.COMMON, V.ORIG, 205, 225, 235, 245)
 	self:AddRecipeFlags(12594, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(12594, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12594, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Mithril Blunderbuss -- 12595
 	AddRecipe(12595, 205, 10508, Q.COMMON, V.ORIG, 205, 225, 235, 245)
 	self:AddRecipeFlags(12595, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.GUN)
-	self:AddRecipeTrainer(12595, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12595, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Hi-Impact Mithril Slugs -- 12596
 	AddRecipe(12596, 210, 10512, Q.COMMON, V.ORIG, 210, 210, 230, 250)
 	self:AddRecipeFlags(12596, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(12596, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12596, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Deadly Scope -- 12597
 	AddRecipe(12597, 210, 10546, Q.COMMON, V.ORIG, 210, 230, 240, 250)
@@ -412,32 +412,32 @@ function addon:InitEngineering()
 	-- Mithril Casing -- 12599
 	AddRecipe(12599, 215, 10561, Q.COMMON, V.ORIG, 215, 215, 235, 255)
 	self:AddRecipeFlags(12599, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12599, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12599, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Mithril Frag Bomb -- 12603
 	AddRecipe(12603, 215, 10514, Q.COMMON, V.ORIG, 215, 215, 235, 255)
 	self:AddRecipeFlags(12603, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12603, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(12603, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Catseye Ultra Goggles -- 12607
 	AddRecipe(12607, 220, 10501, Q.UNCOMMON, V.ORIG, 220, 240, 250, 260)
 	self:AddRecipeFlags(12607, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(12607, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12607, 2)

 	-- Mithril Heavy-bore Rifle -- 12614
 	AddRecipe(12614, 220, 10510, Q.UNCOMMON, V.ORIG, 220, 240, 250, 260)
 	self:AddRecipeFlags(12614, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.GUN)
-	self:AddRecipeAcquire(12614, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12614, 2)

 	-- Spellpower Goggles Xtreme -- 12615
 	AddRecipe(12615, 225, 10502, Q.RARE, V.ORIG, 225, 245, 255, 265)
 	self:AddRecipeFlags(12615, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12615, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(12615, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Parachute Cloak -- 12616
 	AddRecipe(12616, 225, 10518, Q.UNCOMMON, V.ORIG, 225, 245, 255, 265)
 	self:AddRecipeFlags(12616, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.CLOAK)
-	self:AddRecipeAcquire(12616, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12616, 2)

 	-- Deepdive Helmet -- 12617
 	AddRecipe(12617, 230, 10506, Q.COMMON, V.ORIG, 230, 250, 260, 270)
@@ -447,27 +447,27 @@ function addon:InitEngineering()
 	-- Rose Colored Goggles -- 12618
 	AddRecipe(12618, 230, 10503, Q.COMMON, V.ORIG, 230, 250, 260, 270)
 	self:AddRecipeFlags(12618, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12618, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(12618, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Hi-Explosive Bomb -- 12619
 	AddRecipe(12619, 235, 10562, Q.COMMON, V.ORIG, 235, 235, 255, 275)
 	self:AddRecipeFlags(12619, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12619, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(12619, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Sniper Scope -- 12620
 	AddRecipe(12620, 240, 10548, Q.RARE, V.ORIG, 240, 260, 270, 280)
 	self:AddRecipeFlags(12620, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(12620, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(12620, 3)

 	-- Mithril Gyro-Shot -- 12621
 	AddRecipe(12621, 245, 10513, Q.COMMON, V.ORIG, 245, 245, 265, 285)
 	self:AddRecipeFlags(12621, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(12621, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(12621, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Green Lens -- 12622
 	AddRecipe(12622, 245, 10504, Q.COMMON, V.ORIG, 245, 265, 275, 285)
 	self:AddRecipeFlags(12622, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(12622, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(12622, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Mithril Mechanical Dragonling -- 12624
 	AddRecipe(12624, 250, 10576, Q.COMMON, V.ORIG, 250, 270, 280, 290)
@@ -572,7 +572,7 @@ function addon:InitEngineering()
 	-- Mechanical Repair Kit -- 15255
 	AddRecipe(15255, 200, 11590, Q.COMMON, V.ORIG, 200, 200, 220, 240)
 	self:AddRecipeFlags(15255, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(15255, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 3290, 18775, 28697, 33586)
+	self:AddRecipeTrainer(15255, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 33586, 17222, 5518, 11037, 28697, 33611, 8736, 16667, 18775, 26991, 11031, 3290, 5174, 33634, 16726)

 	-- Pet Bombling -- 15628
 	AddRecipe(15628, 205, 11825, Q.UNCOMMON, V.ORIG, 205, 205, 205, 205)
@@ -587,42 +587,42 @@ function addon:InitEngineering()
 	-- Salt Shaker -- 19567
 	AddRecipe(19567, 250, 15846, Q.COMMON, V.ORIG, 250, 270, 280, 290)
 	self:AddRecipeFlags(19567, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(19567, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19567, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Dense Blasting Powder -- 19788
 	AddRecipe(19788, 250, 15992, Q.COMMON, V.ORIG, 250, 250, 255, 260)
 	self:AddRecipeFlags(19788, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(19788, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19788, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Thorium Grenade -- 19790
 	AddRecipe(19790, 260, 15993, Q.COMMON, V.ORIG, 260, 280, 290, 300)
 	self:AddRecipeFlags(19790, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(19790, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19790, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Thorium Widget -- 19791
 	AddRecipe(19791, 260, 15994, Q.COMMON, V.ORIG, 260, 280, 290, 300)
 	self:AddRecipeFlags(19791, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(19791, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19791, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Thorium Rifle -- 19792
 	AddRecipe(19792, 260, 15995, Q.UNCOMMON, V.ORIG, 260, 280, 290, 300)
 	self:AddRecipeFlags(19792, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS, F.GUN)
-	self:AddRecipeTrainer(19792, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19792, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Lifelike Mechanical Toad -- 19793
 	AddRecipe(19793, 265, 15996, Q.UNCOMMON, V.ORIG, 265, 285, 295, 305)
 	self:AddRecipeFlags(19793, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(19793, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(19793, 2)

 	-- Spellpower Goggles Xtreme Plus -- 19794
 	AddRecipe(19794, 270, 15999, Q.UNCOMMON, V.ORIG, 270, 290, 300, 310)
 	self:AddRecipeFlags(19794, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(19794, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19794, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Thorium Tube -- 19795
 	AddRecipe(19795, 275, 16000, Q.COMMON, V.ORIG, 275, 295, 305, 315)
 	self:AddRecipeFlags(19795, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(19795, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19795, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Dark Iron Rifle -- 19796
 	AddRecipe(19796, 275, 16004, Q.UNCOMMON, V.ORIG, 275, 295, 305, 315)
@@ -637,7 +637,7 @@ function addon:InitEngineering()
 	-- Thorium Shells -- 19800
 	AddRecipe(19800, 285, 15997, Q.UNCOMMON, V.ORIG, 285, 295, 300, 305)
 	self:AddRecipeFlags(19800, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.AMMO)
-	self:AddRecipeTrainer(19800, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19800, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Masterwork Target Dummy -- 19814
 	AddRecipe(19814, 275, 16023, Q.COMMON, V.ORIG, 275, 295, 305, 315)
@@ -657,7 +657,7 @@ function addon:InitEngineering()
 	-- Master Engineer's Goggles -- 19825
 	AddRecipe(19825, 290, 16008, Q.UNCOMMON, V.ORIG, 290, 310, 320, 330)
 	self:AddRecipeFlags(19825, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(19825, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(19825, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Arcanite Dragonling -- 19830
 	AddRecipe(19830, 300, 16022, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
@@ -667,7 +667,7 @@ function addon:InitEngineering()
 	-- Arcane Bomb -- 19831
 	AddRecipe(19831, 300, 16040, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(19831, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(19831, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(19831, 2)

 	-- Flawless Arcanite Rifle -- 19833
 	AddRecipe(19833, 300, 16007, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
@@ -722,12 +722,12 @@ function addon:InitEngineering()
 	-- Dense Dynamite -- 23070
 	AddRecipe(23070, 250, 18641, Q.COMMON, V.ORIG, 250, 250, 260, 270)
 	self:AddRecipeFlags(23070, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(23070, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(23070, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Truesilver Transformer -- 23071
 	AddRecipe(23071, 260, 18631, Q.COMMON, V.ORIG, 260, 270, 275, 280)
 	self:AddRecipeFlags(23071, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(23071, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 17222, 16726, 5518, 11037, 26991, 33611, 8736, 16667, 33634, 5174, 11031, 28697, 18775, 33586, 3290)
+	self:AddRecipeTrainer(23071, 11017, 11025, 17634, 3494, 1702, 25277, 18752, 17637, 1676, 26907, 19576, 26955, 3290, 17222, 5518, 11037, 33586, 33611, 8736, 16667, 18775, 26991, 11031, 28697, 5174, 33634, 16726)

 	-- Gyrofreeze Ice Reflector -- 23077
 	AddRecipe(23077, 260, 18634, Q.COMMON, V.ORIG, 260, 280, 290, 300)
@@ -797,7 +797,7 @@ function addon:InitEngineering()
 	-- Tranquil Mechanical Yeti -- 26011
 	AddRecipe(26011, 250, 21277, Q.COMMON, V.ORIG, 250, 320, 330, 340)
 	self:AddRecipeFlags(26011, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(26011, A.QUEST, 8798)
+	self:AddRecipeQuest(26011, 8798)

 	-- Small Blue Rocket -- 26416
 	AddRecipe(26416, 125, 21558, Q.UNCOMMON, V.ORIG, 125, 125, 137, 150)
@@ -887,57 +887,57 @@ function addon:InitEngineering()
 	AddRecipe(28327, 275, 22728, Q.COMMON, V.ORIG, 275, 275, 280, 285)
 	self:AddRecipeFlags(28327, F.ALLIANCE, F.HORDE, F.VENDOR, F.QUEST, F.IBOE, F.RBOP)
 	self:AddRecipeVendor(28327, 3413, 5175)
-	self:AddRecipeAcquire(28327, A.QUEST, 9249)
+	self:AddRecipeQuest(28327, 9249)

 	-- Elemental Blasting Powder -- 30303
 	AddRecipe(30303, 300, 23781, Q.COMMON, V.TBC, 300, 300, 310, 320)
 	self:AddRecipeFlags(30303, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30303, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30303, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Fel Iron Casing -- 30304
 	AddRecipe(30304, 300, 23782, Q.COMMON, V.TBC, 300, 300, 310, 320)
 	self:AddRecipeFlags(30304, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30304, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30304, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Handful of Fel Iron Bolts -- 30305
 	AddRecipe(30305, 300, 23783, Q.COMMON, V.TBC, 300, 300, 305, 310)
 	self:AddRecipeFlags(30305, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30305, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30305, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Adamantite Frame -- 30306
 	AddRecipe(30306, 325, 23784, Q.COMMON, V.TBC, 325, 325, 330, 335)
 	self:AddRecipeFlags(30306, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30306, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30306, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Hardened Adamantite Tube -- 30307
 	AddRecipe(30307, 340, 23785, Q.COMMON, V.TBC, 340, 350, 360, 370)
 	self:AddRecipeFlags(30307, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30307, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30307, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Khorium Power Core -- 30308
 	AddRecipe(30308, 340, 23786, Q.COMMON, V.TBC, 340, 350, 360, 370)
 	self:AddRecipeFlags(30308, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30308, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30308, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Felsteel Stabilizer -- 30309
 	AddRecipe(30309, 340, 23787, Q.COMMON, V.TBC, 340, 350, 360, 370)
 	self:AddRecipeFlags(30309, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30309, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30309, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Fel Iron Bomb -- 30310
 	AddRecipe(30310, 300, 23736, Q.COMMON, V.TBC, 300, 320, 330, 340)
 	self:AddRecipeFlags(30310, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30310, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30310, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Adamantite Grenade -- 30311
 	AddRecipe(30311, 325, 23737, Q.COMMON, V.TBC, 325, 335, 345, 355)
 	self:AddRecipeFlags(30311, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(30311, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30311, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Fel Iron Musket -- 30312
 	AddRecipe(30312, 320, 23742, Q.COMMON, V.TBC, 320, 330, 340, 350)
 	self:AddRecipeFlags(30312, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.GUN)
-	self:AddRecipeTrainer(30312, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30312, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Adamantite Rifle -- 30313
 	AddRecipe(30313, 350, 23746, Q.COMMON, V.TBC, 350, 360, 370, 380)
@@ -952,7 +952,7 @@ function addon:InitEngineering()
 	-- Ornate Khorium Rifle -- 30315
 	AddRecipe(30315, 375, 23748, Q.RARE, V.TBC, 375, 385, 395, 405)
 	self:AddRecipeFlags(30315, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.GUN)
-	self:AddRecipeAcquire(30315, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(30315, 3)

 	-- Cogspinner Goggles -- 30316
 	AddRecipe(30316, 340, 23758, Q.COMMON, V.TBC, 340, 350, 360, 370)
@@ -962,7 +962,7 @@ function addon:InitEngineering()
 	-- Power Amplification Goggles -- 30317
 	AddRecipe(30317, 340, 23761, Q.RARE, V.TBC, 340, 350, 360, 370)
 	self:AddRecipeFlags(30317, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(30317, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(30317, 3)

 	-- Ultra-Spectropic Detection Goggles -- 30318
 	AddRecipe(30318, 350, 23762, Q.COMMON, V.TBC, 350, 360, 370, 380)
@@ -992,12 +992,12 @@ function addon:InitEngineering()
 	-- Crashin' Thrashin' Robot -- 30337
 	AddRecipe(30337, 325, 23767, Q.UNCOMMON, V.TBC, 325, 335, 345, 355)
 	self:AddRecipeFlags(30337, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(30337, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(30337, 2)

 	-- White Smoke Flare -- 30341
 	AddRecipe(30341, 335, 23768, Q.COMMON, V.TBC, 335, 335, 345, 355)
 	self:AddRecipeFlags(30341, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(30341, 16657, 19383, 16782, 18484)
+	self:AddRecipeVendor(30341, 16657, 18484, 19383, 16782)

 	-- Green Smoke Flare -- 30344
 	AddRecipe(30344, 335, 23771, Q.COMMON, V.TBC, 335, 335, 345, 355)
@@ -1007,7 +1007,7 @@ function addon:InitEngineering()
 	-- Fel Iron Shells -- 30346
 	AddRecipe(30346, 310, 23772, Q.COMMON, V.TBC, 310, 310, 320, 330)
 	self:AddRecipeFlags(30346, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(30346, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(30346, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Adamantite Shell Machine -- 30347
 	AddRecipe(30347, 335, 34504, Q.COMMON, V.TBC, 335, 335, 345, 355)
@@ -1032,7 +1032,7 @@ function addon:InitEngineering()
 	-- Zapthrottle Mote Extractor -- 30548
 	AddRecipe(30548, 305, 23821, Q.COMMON, V.TBC, 305, 305, 315, 325)
 	self:AddRecipeFlags(30548, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(30548, A.QUEST, 9635, A.QUEST, 9636)
+	self:AddRecipeQuest(30548, 9635, 9636)

 	-- Healing Potion Injector -- 30551
 	AddRecipe(30551, 330, 33092, Q.RARE, V.TBC, 330, 330, 340, 350)
@@ -1102,7 +1102,7 @@ function addon:InitEngineering()
 	-- Purple Smoke Flare -- 32814
 	AddRecipe(32814, 335, 25886, Q.UNCOMMON, V.TBC, 335, 335, 345, 355)
 	self:AddRecipeFlags(32814, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(32814, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(32814, 2)

 	-- Dimensional Ripper - Area 52 -- 36954
 	AddRecipe(36954, 350, 30542, Q.UNCOMMON, V.TBC, 350, 350, 360, 370, 20222)
@@ -1122,72 +1122,72 @@ function addon:InitEngineering()
 	-- Icy Blasting Primers -- 39971
 	AddRecipe(39971, 335, 32423, Q.COMMON, V.TBC, 335, 335, 340, 345)
 	self:AddRecipeFlags(39971, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(39971, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(39971, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Frost Grenades -- 39973
 	AddRecipe(39973, 335, 32413, Q.COMMON, V.TBC, 335, 345, 355, 365)
 	self:AddRecipeFlags(39973, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(39973, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(39973, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Furious Gizmatic Goggles -- 40274
 	AddRecipe(40274, 350, 32461, Q.COMMON, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(40274, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.WARRIOR, F.IBOP, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(40274, 18775, 26955, 33586, 17637, 19576, 17634, 28697, 18752, 25277)
+	self:AddRecipeTrainer(40274, 18775, 26955, 33586, 17637, 19576, 17634, 28697, 25277, 18752)

 	-- Gyro-balanced Khorium Destroyer -- 41307
 	AddRecipe(41307, 375, 32756, Q.COMMON, V.TBC, 375, 375, 392, 410)
 	self:AddRecipeFlags(41307, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.GUN)
-	self:AddRecipeTrainer(41307, 18775, 26907, 26955, 33586, 25277, 17637, 19576, 33611, 17634, 33634, 28697, 26991, 18752)
+	self:AddRecipeTrainer(41307, 18775, 18752, 26955, 33586, 17634, 17637, 19576, 28697, 33611, 33634, 25277, 26991, 26907)

 	-- Justicebringer 2000 Specs -- 41311
 	AddRecipe(41311, 350, 32472, Q.COMMON, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41311, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOP, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(41311, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41311, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Tankatronic Goggles -- 41312
 	AddRecipe(41312, 350, 32473, Q.COMMON, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41312, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.WARRIOR, F.IBOP, F.RBOP, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(41312, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41312, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Surestrike Goggles v2.0 -- 41314
 	AddRecipe(41314, 350, 32474, Q.COMMON, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41314, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.SHAMAN, F.IBOP, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(41314, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41314, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Gadgetstorm Goggles -- 41315
 	AddRecipe(41315, 350, 32476, Q.EPIC, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41315, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOP, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(41315, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41315, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Living Replicator Specs -- 41316
 	AddRecipe(41316, 350, 32475, Q.EPIC, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41316, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOP, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(41316, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41316, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Deathblow X11 Goggles -- 41317
 	AddRecipe(41317, 350, 32478, Q.COMMON, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41317, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.ROGUE, F.IBOP, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(41317, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41317, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Wonderheal XT40 Shades -- 41318
 	AddRecipe(41318, 350, 32479, Q.EPIC, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41318, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOP, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(41318, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41318, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Magnified Moon Specs -- 41319
 	AddRecipe(41319, 350, 32480, Q.EPIC, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41319, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOP, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(41319, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41319, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Destruction Holo-gogs -- 41320
 	AddRecipe(41320, 350, 32494, Q.COMMON, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41320, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.PRIEST, F.WARLOCK, F.IBOP, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(41320, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41320, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Powerheal 4000 Lens -- 41321
 	AddRecipe(41321, 350, 32495, Q.EPIC, V.TBC, 350, 370, 380, 390)
 	self:AddRecipeFlags(41321, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOP, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(41321, 18775, 26955, 33586, 17637, 19576, 28697, 17634, 18752, 25277, 26991, 26907)
+	self:AddRecipeTrainer(41321, 18775, 26955, 33586, 17637, 19576, 26907, 17634, 25277, 28697, 26991, 18752)

 	-- Adamantite Arrow Maker -- 43676
 	AddRecipe(43676, 335, 20475, Q.UNCOMMON, V.TBC, 335, 335, 345, 355)
@@ -1197,7 +1197,7 @@ function addon:InitEngineering()
 	-- Flying Machine -- 44155
 	AddRecipe(44155, 300, 34060, Q.RARE, V.TBC, 300, 330, 340, 350)
 	self:AddRecipeFlags(44155, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(44155, 25277, 33586, 25099, 24868, 26955, 28697)
+	self:AddRecipeTrainer(44155, 25277, 28697, 33586, 25099, 26955, 24868)

 	-- Turbo-Charged Flying Machine -- 44157
 	AddRecipe(44157, 375, 34061, Q.EPIC, V.TBC, 375, 385, 390, 395)
@@ -1272,187 +1272,187 @@ function addon:InitEngineering()
 	-- Volatile Blasting Trigger -- 53281
 	AddRecipe(53281, 350, 39690, Q.COMMON, V.TBC, 350, 366, 375, 385)
 	self:AddRecipeFlags(53281, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53281, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(53281, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Mark "S" Boomstick -- 54353
 	AddRecipe(54353, 400, 39688, Q.RARE, V.WOTLK, 400, 405, 410, 415)
 	self:AddRecipeFlags(54353, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.DPS, F.GUN)
-	self:AddRecipeTrainer(54353, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(54353, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Personal Electromagnetic Pulse Generator -- 54736
 	AddRecipe(54736, 390, nil, Q.COMMON, V.WOTLK, 390, 390, 392, 395)
 	self:AddRecipeFlags(54736, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(54736, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(54736, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Frag Belt -- 54793
 	AddRecipe(54793, 380, nil, Q.COMMON, V.WOTLK, 380, 380, 382, 385)
 	self:AddRecipeFlags(54793, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(54793, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(54793, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Hand-Mounted Pyro Rocket -- 54998
 	AddRecipe(54998, 400, nil, Q.COMMON, V.WOTLK, 400, 400, 402, 405)
 	self:AddRecipeFlags(54998, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(54998, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(54998, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Hyperspeed Accelerators -- 54999
 	AddRecipe(54999, 400, nil, Q.COMMON, V.WOTLK, 400, 400, 402, 405)
 	self:AddRecipeFlags(54999, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(54999, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(54999, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Flexweave Underlay -- 55002
 	AddRecipe(55002, 380, nil, Q.COMMON, V.WOTLK, 380, 380, 382, 385)
 	self:AddRecipeFlags(55002, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(55002, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(55002, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Nitro Boosts -- 55016
 	AddRecipe(55016, 405, nil, Q.COMMON, V.WOTLK, 405, 405, 405, 410)
 	self:AddRecipeFlags(55016, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(55016, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(55016, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Scrapbot Construction Kit -- 55252
 	AddRecipe(55252, 415, 40769, Q.COMMON, V.WOTLK, 415, 415, 417, 420)
 	self:AddRecipeFlags(55252, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(55252, A.QUEST, 12889)
+	self:AddRecipeQuest(55252, 12889)

 	-- Handful of Cobalt Bolts -- 56349
 	AddRecipe(56349, 350, 39681, Q.COMMON, V.TBC, 350, 360, 370, 380)
 	self:AddRecipeFlags(56349, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56349, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56349, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Hammer Pick -- 56459
 	AddRecipe(56459, 375, 40892, Q.COMMON, V.TBC, 375, 380, 385, 390)
 	self:AddRecipeFlags(56459, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56459, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56459, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Cobalt Frag Bomb -- 56460
 	AddRecipe(56460, 350, 40771, Q.COMMON, V.TBC, 350, 375, 382, 390)
 	self:AddRecipeFlags(56460, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56460, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56460, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Bladed Pickaxe -- 56461
 	AddRecipe(56461, 375, 40893, Q.COMMON, V.WOTLK, 375, 380, 385, 390)
 	self:AddRecipeFlags(56461, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56461, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56461, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Gnomish Army Knife -- 56462
 	AddRecipe(56462, 435, 40772, Q.COMMON, V.WOTLK, 435, 440, 445, 450)
 	self:AddRecipeFlags(56462, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56462, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56462, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Explosive Decoy -- 56463
 	AddRecipe(56463, 375, 40536, Q.COMMON, V.WOTLK, 375, 385, 390, 395)
 	self:AddRecipeFlags(56463, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56463, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56463, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Overcharged Capacitor -- 56464
 	AddRecipe(56464, 375, 39682, Q.COMMON, V.WOTLK, 375, 380, 385, 390)
 	self:AddRecipeFlags(56464, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56464, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56464, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Mechanized Snow Goggles -- 56465
 	AddRecipe(56465, 420, 41112, Q.RARE, V.WOTLK, 420, 425, 432, 440)
 	self:AddRecipeFlags(56465, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.PRIEST, F.WARLOCK, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(56465, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56465, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Sonic Booster -- 56466
 	AddRecipe(56466, 420, 40767, Q.RARE, V.WOTLK, 420, 435, 440, 445)
 	self:AddRecipeFlags(56466, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TRINKET)
-	self:AddRecipeTrainer(56466, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56466, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Noise Machine -- 56467
 	AddRecipe(56467, 420, 40865, Q.RARE, V.WOTLK, 420, 435, 440, 445)
 	self:AddRecipeFlags(56467, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.TRINKET)
-	self:AddRecipeTrainer(56467, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56467, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Box of Bombs -- 56468
 	AddRecipe(56468, 405, 41119, Q.COMMON, V.WOTLK, 405, 410, 415, 420)
 	self:AddRecipeFlags(56468, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56468, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56468, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Gnomish Lightning Generator -- 56469
 	AddRecipe(56469, 425, 41121, Q.RARE, V.WOTLK, 425, 430, 435, 440)
 	self:AddRecipeFlags(56469, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.TRINKET)
-	self:AddRecipeTrainer(56469, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56469, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Sun Scope -- 56470
 	AddRecipe(56470, 425, 41146, Q.RARE, V.WOTLK, 425, 430, 432, 435)
 	self:AddRecipeFlags(56470, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(56470, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56470, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Froststeel Tube -- 56471
 	AddRecipe(56471, 390, 39683, Q.COMMON, V.WOTLK, 390, 395, 400, 405)
 	self:AddRecipeFlags(56471, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56471, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56471, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- MOLL-E -- 56472
 	AddRecipe(56472, 425, 40768, Q.COMMON, V.WOTLK, 425, 430, 432, 435)
 	self:AddRecipeFlags(56472, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56472, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56472, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Gnomish X-Ray Specs -- 56473
 	AddRecipe(56473, 425, 40895, Q.RARE, V.WOTLK, 425, 430, 435, 440, 20219)
 	self:AddRecipeFlags(56473, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56473, 29514, 26955, 26907)
+	self:AddRecipeTrainer(56473, 26907, 26955, 29514)

 	-- Mammoth Cutters -- 56474
 	AddRecipe(56474, 410, 44507, Q.COMMON, V.WOTLK, 410, 410, 415, 420)
 	self:AddRecipeFlags(56474, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(56474, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56474, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Saronite Razorheads -- 56475
 	AddRecipe(56475, 415, 44506, Q.COMMON, V.WOTLK, 415, 415, 417, 425)
 	self:AddRecipeFlags(56475, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56475, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56475, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Healing Injector Kit -- 56476
 	AddRecipe(56476, 410, 37567, Q.COMMON, V.WOTLK, 410, 415, 420, 425)
 	self:AddRecipeFlags(56476, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56476, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56476, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Mana Injector Kit -- 56477
 	AddRecipe(56477, 415, 42546, Q.COMMON, V.WOTLK, 415, 420, 425, 430)
 	self:AddRecipeFlags(56477, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56477, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56477, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Heartseeker Scope -- 56478
 	AddRecipe(56478, 430, 41167, Q.RARE, V.WOTLK, 430, 435, 445, 455)
 	self:AddRecipeFlags(56478, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(56478, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56478, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Armor Plated Combat Shotgun -- 56479
 	AddRecipe(56479, 450, 41168, Q.EPIC, V.WOTLK, 450, 455, 460, 465)
 	self:AddRecipeFlags(56479, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.GUN)
-	self:AddRecipeTrainer(56479, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56479, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Armored Titanium Goggles -- 56480
 	AddRecipe(56480, 440, 42549, Q.RARE, V.WOTLK, 440, 450, 455, 460)
 	self:AddRecipeFlags(56480, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.PALADIN, F.WARRIOR, F.IBOP, F.RBOP, F.DPS, F.TANK, F.PLATE)
-	self:AddRecipeTrainer(56480, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56480, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Weakness Spectralizers -- 56481
 	AddRecipe(56481, 440, 42550, Q.RARE, V.WOTLK, 440, 450, 455, 460)
 	self:AddRecipeFlags(56481, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOP, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(56481, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56481, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Charged Titanium Specs -- 56483
 	AddRecipe(56483, 440, 42552, Q.RARE, V.WOTLK, 440, 450, 455, 460)
 	self:AddRecipeFlags(56483, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.PALADIN, F.WARRIOR, F.IBOP, F.RBOP, F.DPS, F.PLATE)
-	self:AddRecipeTrainer(56483, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56483, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Visage Liquification Goggles -- 56484
 	AddRecipe(56484, 440, 42553, Q.RARE, V.WOTLK, 440, 450, 455, 460)
 	self:AddRecipeFlags(56484, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.PRIEST, F.WARLOCK, F.IBOP, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(56484, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56484, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Greensight Gogs -- 56486
 	AddRecipe(56486, 440, 42554, Q.RARE, V.WOTLK, 440, 450, 455, 460)
 	self:AddRecipeFlags(56486, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOP, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(56486, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56486, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Electroflux Sight Enhancers -- 56487
 	AddRecipe(56487, 440, 42555, Q.RARE, V.WOTLK, 440, 450, 455, 460)
 	self:AddRecipeFlags(56487, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOP, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(56487, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56487, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Global Thermal Sapper Charge -- 56514
 	AddRecipe(56514, 425, 42641, Q.COMMON, V.WOTLK, 425, 425, 430, 435, 20222)
@@ -1462,32 +1462,32 @@ function addon:InitEngineering()
 	-- Truesight Ice Blinders -- 56574
 	AddRecipe(56574, 440, 42551, Q.COMMON, V.WOTLK, 440, 450, 455, 460)
 	self:AddRecipeFlags(56574, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.SHAMAN, F.IBOP, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(56574, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(56574, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Nesingwary 4000 -- 60874
 	AddRecipe(60874, 450, 44504, Q.EPIC, V.WOTLK, 450, 455, 460, 465)
 	self:AddRecipeFlags(60874, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.GUN)
-	self:AddRecipeTrainer(60874, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(60874, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Diamond-cut Refractor Scope -- 61471
 	AddRecipe(61471, 390, 44739, Q.COMMON, V.WOTLK, 390, 400, 407, 415)
 	self:AddRecipeFlags(61471, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(61471, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(61471, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Mechanized Snow Goggles -- 61481
 	AddRecipe(61481, 420, 44742, Q.RARE, V.WOTLK, 420, 425, 432, 440)
 	self:AddRecipeFlags(61481, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.ROGUE, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(61481, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(61481, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Mechanized Snow Goggles -- 61482
 	AddRecipe(61482, 420, 44742, Q.RARE, V.WOTLK, 420, 425, 432, 440)
 	self:AddRecipeFlags(61482, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.SHAMAN, F.IBOE, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(61482, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(61482, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Mechanized Snow Goggles -- 61483
 	AddRecipe(61483, 420, 44742, Q.RARE, V.WOTLK, 420, 425, 432, 440)
 	self:AddRecipeFlags(61483, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.PALADIN, F.WARRIOR, F.IBOE, F.RBOP, F.PLATE)
-	self:AddRecipeTrainer(61483, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(61483, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Unbreakable Healing Amplifiers -- 62271
 	AddRecipe(62271, 440, 44949, Q.RARE, V.WOTLK, 440, 450, 455, 460)
@@ -1497,17 +1497,17 @@ function addon:InitEngineering()
 	-- High-powered Flashlight -- 63750
 	AddRecipe(63750, 250, 45631, Q.COMMON, V.WOTLK, 250, 270, 280, 290)
 	self:AddRecipeFlags(63750, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TRINKET)
-	self:AddRecipeTrainer(63750, 11017, 11025, 17634, 3494, 1702, 25277, 17637, 1676, 26907, 33634, 26955, 16726, 5518, 11037, 33611, 8736, 16667, 17222, 26991, 11031, 28697, 33586, 5174, 3290)
+	self:AddRecipeTrainer(63750, 11017, 11025, 17634, 3494, 1702, 25277, 17637, 1676, 26907, 33634, 26955, 16726, 5518, 11037, 33611, 8736, 16667, 3290, 26991, 11031, 28697, 5174, 33586, 17222)

 	-- Springy Arachnoweave -- 63765
 	AddRecipe(63765, 380, nil, Q.COMMON, V.WOTLK, 380, 380, 382, 385)
 	self:AddRecipeFlags(63765, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(63765, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(63765, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Reticulated Armor Webbing -- 63770
 	AddRecipe(63770, 400, nil, Q.COMMON, V.WOTLK, 400, 400, 402, 405)
 	self:AddRecipeFlags(63770, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.TANK)
-	self:AddRecipeTrainer(63770, 26907, 25277, 33586, 28697, 26955, 26991)
+	self:AddRecipeTrainer(63770, 26907, 25277, 26991, 28697, 26955, 33586)

 	-- Goblin Beam Welder -- 67326
 	AddRecipe(67326, 410, 47828, Q.COMMON, V.WOTLK, 410, 415, 420, 425)
@@ -1527,7 +1527,7 @@ function addon:InitEngineering()
 	-- Jeeves -- 68067
 	AddRecipe(68067, 450, 49050, Q.RARE, V.WOTLK, 450, 480, 485, 490)
 	self:AddRecipeFlags(68067, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOP, F.RBOP)
-	self:AddRecipeAcquire(68067, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(68067, 2)

 	-- Shatter Rounds -- 72952
 	AddRecipe(72952, 450, 52020, Q.EPIC, V.WOTLK, 450, 450, 450, 460, 20222)
@@ -1552,10 +1552,10 @@ function addon:InitEngineering()
 		self:AddRecipeAcquire(60867, A.REPUTATION, FAC.ALLIANCE_VANGUARD, REP.EXALTED, 32564, A.REPUTATION, FAC.ALLIANCE_VANGUARD, REP.EXALTED, 32773)
 	elseif faction == BFAC["Horde"] then

-	-- Mechano-hog -- 60866
-	AddRecipe(60866, 450, 41508, Q.EPIC, V.WOTLK, 450, 480, 485, 490)
-	self:AddRecipeFlags(60866, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.WRATHCOMMON1)
-	self:AddRecipeRepVendor(60866, FAC.HORDE_EXPEDITION, REP.EXALTED, 32565, 32774)
+		-- Mechano-hog -- 60866
+		AddRecipe(60866, 450, 41508, Q.EPIC, V.WOTLK, 450, 480, 485, 490)
+		self:AddRecipeFlags(60866, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.WRATHCOMMON1)
+		self:AddRecipeRepVendor(60866, FAC.HORDE_EXPEDITION, REP.EXALTED, 32565, 32774)
 	end
 	return num_recipes
 end
diff --git a/Database/FirstAid.lua b/Database/FirstAid.lua
index 4220a3c..8db346d 100644
--- a/Database/FirstAid.lua
+++ b/Database/FirstAid.lua
@@ -58,57 +58,57 @@ function addon:InitFirstAid()
 	-- Heavy Linen Bandage -- 3276
 	AddRecipe(3276, 40, 2581, Q.COMMON, V.ORIG, 40, 50, 75, 100)
 	self:AddRecipeFlags(3276, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3276, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(3276, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Wool Bandage -- 3277
 	AddRecipe(3277, 80, 3530, Q.COMMON, V.ORIG, 80, 80, 115, 150)
 	self:AddRecipeFlags(3277, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3277, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(3277, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Heavy Wool Bandage -- 3278
 	AddRecipe(3278, 115, 3531, Q.COMMON, V.ORIG, 115, 115, 150, 185)
 	self:AddRecipeFlags(3278, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3278, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(3278, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Silk Bandage -- 7928
 	AddRecipe(7928, 150, 6450, Q.COMMON, V.ORIG, 150, 150, 180, 210)
 	self:AddRecipeFlags(7928, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(7928, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(7928, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Heavy Silk Bandage -- 7929
 	AddRecipe(7929, 180, 6451, Q.COMMON, V.ORIG, 180, 180, 210, 240)
 	self:AddRecipeFlags(7929, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(7929, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(7929, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Anti-Venom -- 7934
 	AddRecipe(7934, 80, 6452, Q.COMMON, V.ORIG, 80, 80, 115, 150)
 	self:AddRecipeFlags(7934, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(7934, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(7934, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Strong Anti-Venom -- 7935
 	AddRecipe(7935, 130, 6453, Q.UNCOMMON, V.ORIG, 130, 130, 165, 200)
 	self:AddRecipeFlags(7935, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(7935, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7935, 2)

 	-- Mageweave Bandage -- 10840
 	AddRecipe(10840, 210, 8544, Q.COMMON, V.ORIG, 210, 210, 240, 270)
 	self:AddRecipeFlags(10840, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(10840, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(10840, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Heavy Mageweave Bandage -- 10841
 	AddRecipe(10841, 240, 8545, Q.COMMON, V.ORIG, 240, 240, 270, 300)
 	self:AddRecipeFlags(10841, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(10841, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(10841, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Runecloth Bandage -- 18629
 	AddRecipe(18629, 260, 14529, Q.COMMON, V.ORIG, 260, 260, 290, 320)
 	self:AddRecipeFlags(18629, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(18629, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(18629, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Heavy Runecloth Bandage -- 18630
 	AddRecipe(18630, 290, 14530, Q.COMMON, V.ORIG, 290, 290, 320, 350)
 	self:AddRecipeFlags(18630, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(18630, 33589, 33621, 17214, 16272, 19184, 23734, 5939, 5943, 4211, 2326, 4591, 26992, 16662, 28706, 29233, 18990, 26956, 17424, 3181, 22477, 18991, 3373, 19478, 5759, 16731, 2327, 2329, 5150, 2798, 6094)
+	self:AddRecipeTrainer(18630, 33589, 33621, 17214, 16272, 19184, 6094, 5939, 5943, 4211, 2326, 4591, 3181, 16662, 28706, 5150, 2329, 26956, 17424, 18990, 18991, 23734, 3373, 16731, 5759, 19478, 2327, 26992, 22477, 2798, 29233)

 	-- Powerful Anti-Venom -- 23787
 	AddRecipe(23787, 300, 19440, Q.COMMON, V.ORIG, 300, 300, 330, 360)
@@ -118,12 +118,12 @@ function addon:InitFirstAid()
 	-- Netherweave Bandage -- 27032
 	AddRecipe(27032, 300, 21990, Q.COMMON, V.TBC, 300, 330, 347, 365)
 	self:AddRecipeFlags(27032, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(27032, 28706, 18991, 29233, 26956, 26992, 23734, 33589, 18990)
+	self:AddRecipeTrainer(27032, 26956, 18991, 29233, 18990, 26992, 23734, 33589, 28706)

 	-- Heavy Netherweave Bandage -- 27033
 	AddRecipe(27033, 330, 21991, Q.COMMON, V.TBC, 330, 360, 367, 375)
 	self:AddRecipeFlags(27033, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
-	self:AddRecipeTrainer(27033, 28706, 18991, 29233, 26956, 26992, 23734, 33589, 18990)
+	self:AddRecipeTrainer(27033, 26956, 18991, 29233, 18990, 26992, 23734, 33589, 28706)

 	-- Frostweave Bandage -- 45545
 	AddRecipe(45545, 350, 34721, Q.COMMON, V.WOTLK, 350, 375, 392, 410)
@@ -133,7 +133,7 @@ function addon:InitFirstAid()
 	-- Heavy Frostweave Bandage -- 45546
 	AddRecipe(45546, 400, 34722, Q.UNCOMMON, V.WOTLK, 400, 400, 430, 470)
 	self:AddRecipeFlags(45546, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(45546, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(45546, 2)

 	return num_recipes
 end
diff --git a/Database/Inscription.lua b/Database/Inscription.lua
index 0b9645a..8af65b8 100644
--- a/Database/Inscription.lua
+++ b/Database/Inscription.lua
@@ -71,42 +71,42 @@ function addon:InitInscription()
 	-- Glyph of Entangling Roots -- 48121
 	AddRecipe(48121, 100, 40924, Q.COMMON, V.WOTLK, 100, 105, 110, 115)
 	self:AddRecipeFlags(48121, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(48121, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(48121, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Mysterious Tarot -- 48247
 	AddRecipe(48247, 110, 37168, Q.COMMON, V.WOTLK, 110, 125, 137, 150)
 	self:AddRecipeFlags(48247, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(48247, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(48247, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Recall -- 48248
 	AddRecipe(48248, 35, 37118, Q.COMMON, V.WOTLK, 35, 60, 67, 75)
 	self:AddRecipeFlags(48248, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(48248, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(48248, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Intellect II -- 50598
 	AddRecipe(50598, 75, 2290, Q.COMMON, V.WOTLK, 75, 75, 80, 85)
 	self:AddRecipeFlags(50598, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50598, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50598, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Intellect III -- 50599
 	AddRecipe(50599, 165, 4419, Q.COMMON, V.WOTLK, 165, 170, 175, 180)
 	self:AddRecipeFlags(50599, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50599, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50599, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Intellect IV -- 50600
 	AddRecipe(50600, 215, 10308, Q.COMMON, V.WOTLK, 215, 220, 225, 230)
 	self:AddRecipeFlags(50600, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50600, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50600, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Intellect V -- 50601
 	AddRecipe(50601, 260, 27499, Q.COMMON, V.WOTLK, 260, 265, 270, 275)
 	self:AddRecipeFlags(50601, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50601, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50601, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Intellect VI -- 50602
 	AddRecipe(50602, 310, 33458, Q.COMMON, V.WOTLK, 310, 310, 315, 320)
 	self:AddRecipeFlags(50602, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50602, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50602, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Intellect VII -- 50603
 	AddRecipe(50603, 360, 37091, Q.COMMON, V.WOTLK, 360, 365, 370, 375)
@@ -121,27 +121,27 @@ function addon:InitInscription()
 	-- Scroll of Spirit II -- 50605
 	AddRecipe(50605, 75, 1712, Q.COMMON, V.WOTLK, 75, 75, 80, 85)
 	self:AddRecipeFlags(50605, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(50605, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50605, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Spirit III -- 50606
 	AddRecipe(50606, 160, 4424, Q.COMMON, V.WOTLK, 160, 165, 170, 175)
 	self:AddRecipeFlags(50606, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(50606, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50606, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Spirit IV -- 50607
 	AddRecipe(50607, 210, 10306, Q.COMMON, V.WOTLK, 210, 215, 220, 225)
 	self:AddRecipeFlags(50607, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(50607, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50607, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Spirit V -- 50608
 	AddRecipe(50608, 255, 27501, Q.COMMON, V.WOTLK, 255, 260, 265, 270)
 	self:AddRecipeFlags(50608, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(50608, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50608, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Spirit VI -- 50609
 	AddRecipe(50609, 295, 33460, Q.COMMON, V.WOTLK, 295, 305, 310, 315)
 	self:AddRecipeFlags(50609, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(50609, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50609, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Spirit VII -- 50610
 	AddRecipe(50610, 355, 37097, Q.COMMON, V.WOTLK, 355, 360, 365, 370)
@@ -156,27 +156,27 @@ function addon:InitInscription()
 	-- Scroll of Stamina II -- 50612
 	AddRecipe(50612, 75, 1711, Q.COMMON, V.WOTLK, 75, 75, 80, 85)
 	self:AddRecipeFlags(50612, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50612, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50612, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Stamina III -- 50614
 	AddRecipe(50614, 155, 4422, Q.COMMON, V.WOTLK, 155, 160, 165, 170)
 	self:AddRecipeFlags(50614, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50614, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50614, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Stamina IV -- 50616
 	AddRecipe(50616, 205, 10307, Q.COMMON, V.WOTLK, 205, 210, 215, 220)
 	self:AddRecipeFlags(50616, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50616, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50616, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Stamina V -- 50617
 	AddRecipe(50617, 250, 27502, Q.COMMON, V.WOTLK, 250, 255, 260, 265)
 	self:AddRecipeFlags(50617, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50617, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50617, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Stamina VI -- 50618
 	AddRecipe(50618, 290, 33461, Q.COMMON, V.WOTLK, 290, 300, 305, 310)
 	self:AddRecipeFlags(50618, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(50618, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(50618, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Stamina VII -- 50619
 	AddRecipe(50619, 350, 37093, Q.COMMON, V.WOTLK, 350, 355, 360, 365)
@@ -196,22 +196,22 @@ function addon:InitInscription()
 	-- Armor Vellum -- 52739
 	AddRecipe(52739, 35, 38682, Q.COMMON, V.WOTLK, 35, 75, 87, 100)
 	self:AddRecipeFlags(52739, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(52739, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(52739, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Weapon Vellum -- 52840
 	AddRecipe(52840, 75, 39349, Q.COMMON, V.WOTLK, 75, 100, 112, 125)
 	self:AddRecipeFlags(52840, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(52840, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(52840, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Moonglow Ink -- 52843
 	AddRecipe(52843, 35, 39469, Q.COMMON, V.WOTLK, 35, 45, 60, 75)
 	self:AddRecipeFlags(52843, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(52843, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(52843, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Midnight Ink -- 53462
 	AddRecipe(53462, 75, 39774, Q.COMMON, V.WOTLK, 75, 75, 77, 80)
 	self:AddRecipeFlags(53462, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(53462, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(53462, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Frenzied Regeneration -- 56943
 	AddRecipe(56943, 350, 40896, Q.COMMON, V.WOTLK, 350, 355, 360, 365)
@@ -226,7 +226,7 @@ function addon:InitInscription()
 	-- Glyph of Healing Touch -- 56945
 	AddRecipe(56945, 115, 40914, Q.COMMON, V.WOTLK, 115, 120, 125, 130)
 	self:AddRecipeFlags(56945, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP, F.HEALER)
-	self:AddRecipeTrainer(56945, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56945, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Hurricane -- 56946
 	AddRecipe(56946, 385, 40920, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -241,7 +241,7 @@ function addon:InitInscription()
 	-- Glyph of Insect Swarm -- 56948
 	AddRecipe(56948, 150, 40919, Q.COMMON, V.WOTLK, 150, 155, 160, 165)
 	self:AddRecipeFlags(56948, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56948, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56948, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Lifebloom -- 56949
 	AddRecipe(56949, 385, 40915, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -256,7 +256,7 @@ function addon:InitInscription()
 	-- Glyph of Moonfire -- 56951
 	AddRecipe(56951, 130, 40923, Q.COMMON, V.WOTLK, 130, 135, 140, 145)
 	self:AddRecipeFlags(56951, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56951, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56951, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Rake -- 56952
 	AddRecipe(56952, 310, 40903, Q.COMMON, V.WOTLK, 310, 315, 320, 325)
@@ -266,7 +266,7 @@ function addon:InitInscription()
 	-- Glyph of Rebirth -- 56953
 	AddRecipe(56953, 170, 40909, Q.COMMON, V.WOTLK, 170, 175, 180, 185)
 	self:AddRecipeFlags(56953, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56953, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56953, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Regrowth -- 56954
 	AddRecipe(56954, 385, 40912, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -276,17 +276,17 @@ function addon:InitInscription()
 	-- Glyph of Rejuvenation -- 56955
 	AddRecipe(56955, 80, 40913, Q.COMMON, V.WOTLK, 80, 90, 100, 110)
 	self:AddRecipeFlags(56955, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP, F.HEALER)
-	self:AddRecipeTrainer(56955, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56955, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Rip -- 56956
 	AddRecipe(56956, 200, 40902, Q.COMMON, V.WOTLK, 200, 205, 210, 215)
 	self:AddRecipeFlags(56956, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56956, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56956, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Shred -- 56957
 	AddRecipe(56957, 260, 40901, Q.COMMON, V.WOTLK, 260, 265, 270, 275)
 	self:AddRecipeFlags(56957, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56957, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56957, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Starfall -- 56958
 	AddRecipe(56958, 385, 40921, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -296,7 +296,7 @@ function addon:InitInscription()
 	-- Glyph of Starfire -- 56959
 	AddRecipe(56959, 220, 40916, Q.COMMON, V.WOTLK, 220, 225, 230, 235)
 	self:AddRecipeFlags(56959, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56959, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56959, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Swiftmend -- 56960
 	AddRecipe(56960, 385, 40906, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -306,12 +306,12 @@ function addon:InitInscription()
 	-- Glyph of Maul -- 56961
 	AddRecipe(56961, 90, 40897, Q.COMMON, V.WOTLK, 90, 100, 110, 120)
 	self:AddRecipeFlags(56961, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(56961, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56961, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Wrath -- 56963
 	AddRecipe(56963, 85, 40922, Q.COMMON, V.WOTLK, 85, 95, 105, 115)
 	self:AddRecipeFlags(56963, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56963, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56963, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Typhoon -- 56965
 	AddRecipe(56965, 310, 44955, Q.COMMON, V.WOTLK, 310, 320, 325, 330)
@@ -321,12 +321,12 @@ function addon:InitInscription()
 	-- Glyph of Arcane Explosion -- 56968
 	AddRecipe(56968, 100, 42734, Q.COMMON, V.WOTLK, 100, 105, 110, 115)
 	self:AddRecipeFlags(56968, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56968, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56968, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Arcane Missiles -- 56971
 	AddRecipe(56971, 115, 42735, Q.COMMON, V.WOTLK, 115, 120, 125, 130)
 	self:AddRecipeFlags(56971, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56971, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56971, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Arcane Power -- 56972
 	AddRecipe(56972, 335, 42736, Q.COMMON, V.WOTLK, 335, 340, 345, 350)
@@ -336,12 +336,12 @@ function addon:InitInscription()
 	-- Glyph of Blink -- 56973
 	AddRecipe(56973, 130, 42737, Q.COMMON, V.WOTLK, 130, 135, 140, 145)
 	self:AddRecipeFlags(56973, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56973, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56973, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Evocation -- 56974
 	AddRecipe(56974, 155, 42738, Q.COMMON, V.WOTLK, 155, 160, 165, 170)
 	self:AddRecipeFlags(56974, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56974, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56974, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Fireball -- 56975
 	AddRecipe(56975, 385, 42739, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -351,7 +351,7 @@ function addon:InitInscription()
 	-- Glyph of Frost Nova -- 56976
 	AddRecipe(56976, 80, 42741, Q.COMMON, V.WOTLK, 80, 90, 100, 110)
 	self:AddRecipeFlags(56976, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56976, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56976, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Frostbolt -- 56977
 	AddRecipe(56977, 385, 42742, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -361,12 +361,12 @@ function addon:InitInscription()
 	-- Glyph of Ice Armor -- 56978
 	AddRecipe(56978, 90, 42743, Q.COMMON, V.WOTLK, 90, 100, 110, 120)
 	self:AddRecipeFlags(56978, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56978, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56978, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Ice Block -- 56979
 	AddRecipe(56979, 225, 42744, Q.COMMON, V.WOTLK, 225, 230, 235, 240)
 	self:AddRecipeFlags(56979, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56979, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 30711, 33615, 26995, 33679, 26977, 30713, 28702)
+	self:AddRecipeTrainer(56979, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 26959, 30710, 30711, 30715, 33679, 26977, 30713, 33615)

 	-- Glyph of Ice Lance -- 56980
 	AddRecipe(56980, 375, 42745, Q.COMMON, V.WOTLK, 375, 380, 385, 390)
@@ -376,12 +376,12 @@ function addon:InitInscription()
 	-- Glyph of Icy Veins -- 56981
 	AddRecipe(56981, 175, 42746, Q.COMMON, V.WOTLK, 175, 180, 185, 190)
 	self:AddRecipeFlags(56981, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56981, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56981, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Scorch -- 56982
 	AddRecipe(56982, 205, 42747, Q.COMMON, V.WOTLK, 205, 210, 215, 220)
 	self:AddRecipeFlags(56982, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56982, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56982, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Invisibility -- 56983
 	AddRecipe(56983, 385, 42748, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -396,7 +396,7 @@ function addon:InitInscription()
 	-- Glyph of Mana Gem -- 56985
 	AddRecipe(56985, 280, 42750, Q.COMMON, V.WOTLK, 280, 285, 290, 295)
 	self:AddRecipeFlags(56985, F.ALLIANCE, F.HORDE, F.TRAINER, F.MAGE, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(56985, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56985, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Molten Armor -- 56986
 	AddRecipe(56986, 385, 42751, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -431,12 +431,12 @@ function addon:InitInscription()
 	-- Glyph of Aimed Shot -- 56994
 	AddRecipe(56994, 175, 42897, Q.COMMON, V.WOTLK, 175, 180, 185, 190)
 	self:AddRecipeFlags(56994, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(56994, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56994, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Arcane Shot -- 56995
 	AddRecipe(56995, 100, 42898, Q.COMMON, V.WOTLK, 100, 105, 110, 115)
 	self:AddRecipeFlags(56995, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(56995, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56995, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of the Beast -- 56996
 	AddRecipe(56996, 385, 42899, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -446,7 +446,7 @@ function addon:InitInscription()
 	-- Glyph of Mending -- 56997
 	AddRecipe(56997, 115, 42900, Q.COMMON, V.WOTLK, 115, 120, 125, 130)
 	self:AddRecipeFlags(56997, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(56997, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(56997, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Aspect of the Viper -- 56998
 	AddRecipe(56998, 385, 42901, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -461,17 +461,17 @@ function addon:InitInscription()
 	-- Glyph of Deterrence -- 57000
 	AddRecipe(57000, 200, 42903, Q.COMMON, V.WOTLK, 200, 205, 210, 215)
 	self:AddRecipeFlags(57000, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57000, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57000, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Disengage -- 57001
 	AddRecipe(57001, 225, 42904, Q.COMMON, V.WOTLK, 225, 230, 235, 240)
 	self:AddRecipeFlags(57001, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57001, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57001, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Freezing Trap -- 57002
 	AddRecipe(57002, 260, 42905, Q.COMMON, V.WOTLK, 260, 265, 270, 275)
 	self:AddRecipeFlags(57002, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57002, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57002, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Frost Trap -- 57003
 	AddRecipe(57003, 350, 42906, Q.COMMON, V.WOTLK, 350, 355, 360, 365)
@@ -481,12 +481,12 @@ function addon:InitInscription()
 	-- Glyph of Hunter's Mark -- 57004
 	AddRecipe(57004, 80, 42907, Q.COMMON, V.WOTLK, 80, 90, 100, 110)
 	self:AddRecipeFlags(57004, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57004, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57004, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Immolation Trap -- 57005
 	AddRecipe(57005, 130, 42908, Q.COMMON, V.WOTLK, 130, 135, 140, 145)
 	self:AddRecipeFlags(57005, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57005, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57005, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of the Hawk -- 57006
 	AddRecipe(57006, 375, 42909, Q.COMMON, V.WOTLK, 375, 380, 385, 390)
@@ -496,7 +496,7 @@ function addon:InitInscription()
 	-- Glyph of Multi-Shot -- 57007
 	AddRecipe(57007, 150, 42910, Q.COMMON, V.WOTLK, 150, 155, 160, 165)
 	self:AddRecipeFlags(57007, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57007, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 30711, 33615, 26995, 33679, 26977, 30713, 28702)
+	self:AddRecipeTrainer(57007, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 26959, 30710, 30711, 30715, 33679, 26977, 30713, 33615)

 	-- Glyph of Rapid Fire -- 57008
 	AddRecipe(57008, 315, 42911, Q.COMMON, V.WOTLK, 315, 320, 325, 330)
@@ -506,7 +506,7 @@ function addon:InitInscription()
 	-- Glyph of Serpent Sting -- 57009
 	AddRecipe(57009, 90, 42912, Q.COMMON, V.WOTLK, 90, 100, 110, 120)
 	self:AddRecipeFlags(57009, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57009, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57009, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Snake Trap -- 57010
 	AddRecipe(57010, 385, 42913, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -541,7 +541,7 @@ function addon:InitInscription()
 	-- Glyph of Cleansing -- 57020
 	AddRecipe(57020, 180, 41104, Q.COMMON, V.WOTLK, 180, 185, 190, 195)
 	self:AddRecipeFlags(57020, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57020, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57020, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Avenging Wrath -- 57021
 	AddRecipe(57021, 385, 41107, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -551,22 +551,22 @@ function addon:InitInscription()
 	-- Glyph of Spiritual Attunement -- 57022
 	AddRecipe(57022, 80, 41096, Q.COMMON, V.WOTLK, 80, 90, 100, 110)
 	self:AddRecipeFlags(57022, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(57022, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57022, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Consecration -- 57023
 	AddRecipe(57023, 205, 41099, Q.COMMON, V.WOTLK, 205, 210, 215, 220)
 	self:AddRecipeFlags(57023, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57023, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57023, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Crusader Strike -- 57024
 	AddRecipe(57024, 230, 41098, Q.COMMON, V.WOTLK, 230, 235, 240, 245)
 	self:AddRecipeFlags(57024, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57024, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57024, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Exorcism -- 57025
 	AddRecipe(57025, 265, 41103, Q.COMMON, V.WOTLK, 265, 270, 275, 280)
 	self:AddRecipeFlags(57025, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57025, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57025, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Flash of Light -- 57026
 	AddRecipe(57026, 300, 41105, Q.COMMON, V.WOTLK, 300, 305, 310, 315)
@@ -576,7 +576,7 @@ function addon:InitInscription()
 	-- Glyph of Hammer of Justice -- 57027
 	AddRecipe(57027, 90, 41095, Q.COMMON, V.WOTLK, 90, 100, 110, 120)
 	self:AddRecipeFlags(57027, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57027, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57027, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Hammer of Wrath -- 57028
 	AddRecipe(57028, 385, 41097, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -586,22 +586,22 @@ function addon:InitInscription()
 	-- Glyph of Holy Light -- 57029
 	AddRecipe(57029, 105, 41106, Q.COMMON, V.WOTLK, 105, 110, 115, 120)
 	self:AddRecipeFlags(57029, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP, F.HEALER)
-	self:AddRecipeTrainer(57029, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57029, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Judgement -- 57030
 	AddRecipe(57030, 120, 41092, Q.COMMON, V.WOTLK, 120, 125, 130, 135)
 	self:AddRecipeFlags(57030, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57030, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57030, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Divinity -- 57031
 	AddRecipe(57031, 135, 41108, Q.COMMON, V.WOTLK, 135, 140, 145, 150)
 	self:AddRecipeFlags(57031, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57031, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57031, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Righteous Defense -- 57032
 	AddRecipe(57032, 155, 41100, Q.COMMON, V.WOTLK, 155, 160, 165, 170)
 	self:AddRecipeFlags(57032, F.ALLIANCE, F.HORDE, F.TRAINER, F.PALADIN, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeTrainer(57032, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57032, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Seal of Command -- 57033
 	AddRecipe(57033, 335, 41094, Q.COMMON, V.WOTLK, 335, 340, 345, 350)
@@ -636,7 +636,7 @@ function addon:InitInscription()
 	-- Glyph of Backstab -- 57114
 	AddRecipe(57114, 80, 42956, Q.COMMON, V.WOTLK, 80, 90, 100, 110)
 	self:AddRecipeFlags(57114, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57114, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57114, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Blade Flurry -- 57115
 	AddRecipe(57115, 385, 42957, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -656,17 +656,17 @@ function addon:InitInscription()
 	-- Glyph of Evasion -- 57119
 	AddRecipe(57119, 95, 42960, Q.COMMON, V.WOTLK, 95, 105, 115, 125)
 	self:AddRecipeFlags(57119, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57119, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57119, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Eviscerate -- 57120
 	AddRecipe(57120, 105, 42961, Q.COMMON, V.WOTLK, 105, 110, 115, 120)
 	self:AddRecipeFlags(57120, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57120, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57120, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Expose Armor -- 57121
 	AddRecipe(57121, 120, 42962, Q.COMMON, V.WOTLK, 120, 125, 130, 135)
 	self:AddRecipeFlags(57121, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57121, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57121, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Feint -- 57122
 	AddRecipe(57122, 305, 42963, Q.COMMON, V.WOTLK, 305, 310, 315, 320)
@@ -676,7 +676,7 @@ function addon:InitInscription()
 	-- Glyph of Garrote -- 57123
 	AddRecipe(57123, 135, 42964, Q.COMMON, V.WOTLK, 135, 140, 145, 150)
 	self:AddRecipeFlags(57123, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57123, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57123, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Ghostly Strike -- 57124
 	AddRecipe(57124, 385, 42965, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -686,7 +686,7 @@ function addon:InitInscription()
 	-- Glyph of Gouge -- 57125
 	AddRecipe(57125, 160, 42966, Q.COMMON, V.WOTLK, 160, 165, 170, 175)
 	self:AddRecipeFlags(57125, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57125, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57125, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Hemorrhage -- 57126
 	AddRecipe(57126, 385, 42967, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -706,7 +706,7 @@ function addon:InitInscription()
 	-- Glyph of Sap -- 57129
 	AddRecipe(57129, 185, 42970, Q.COMMON, V.WOTLK, 185, 190, 195, 200)
 	self:AddRecipeFlags(57129, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57129, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57129, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Vigor -- 57130
 	AddRecipe(57130, 385, 42971, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -716,22 +716,22 @@ function addon:InitInscription()
 	-- Glyph of Sinister Strike -- 57131
 	AddRecipe(57131, 210, 42972, Q.COMMON, V.WOTLK, 210, 215, 220, 225)
 	self:AddRecipeFlags(57131, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57131, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57131, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Slice and Dice -- 57132
 	AddRecipe(57132, 235, 42973, Q.COMMON, V.WOTLK, 235, 240, 245, 250)
 	self:AddRecipeFlags(57132, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57132, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57132, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Sprint -- 57133
 	AddRecipe(57133, 285, 42974, Q.COMMON, V.WOTLK, 285, 290, 295, 300)
 	self:AddRecipeFlags(57133, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57133, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57133, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Barbaric Insults -- 57151
 	AddRecipe(57151, 220, 43420, Q.COMMON, V.WOTLK, 220, 225, 230, 235)
 	self:AddRecipeFlags(57151, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(57151, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57151, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Blocking -- 57152
 	AddRecipe(57152, 385, 43425, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -746,7 +746,7 @@ function addon:InitInscription()
 	-- Glyph of Cleaving -- 57154
 	AddRecipe(57154, 240, 43414, Q.COMMON, V.WOTLK, 240, 245, 250, 255)
 	self:AddRecipeFlags(57154, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57154, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57154, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Devastate -- 57155
 	AddRecipe(57155, 385, 43415, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -756,17 +756,17 @@ function addon:InitInscription()
 	-- Glyph of Execution -- 57156
 	AddRecipe(57156, 285, 43416, Q.COMMON, V.WOTLK, 285, 290, 295, 300)
 	self:AddRecipeFlags(57156, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57156, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57156, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Hamstring -- 57157
 	AddRecipe(57157, 125, 43417, Q.COMMON, V.WOTLK, 125, 130, 135, 140)
 	self:AddRecipeFlags(57157, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57157, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57157, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Heroic Strike -- 57158
 	AddRecipe(57158, 95, 43418, Q.COMMON, V.WOTLK, 95, 105, 115, 125)
 	self:AddRecipeFlags(57158, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57158, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57158, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Intervene -- 57159
 	AddRecipe(57159, 385, 43419, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -781,17 +781,17 @@ function addon:InitInscription()
 	-- Glyph of Overpower -- 57161
 	AddRecipe(57161, 170, 43422, Q.COMMON, V.WOTLK, 170, 175, 180, 185)
 	self:AddRecipeFlags(57161, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57161, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57161, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Rapid Charge -- 57162
 	AddRecipe(57162, 85, 43413, Q.COMMON, V.WOTLK, 85, 95, 105, 115)
 	self:AddRecipeFlags(57162, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57162, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57162, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Rending -- 57163
 	AddRecipe(57163, 110, 43423, Q.COMMON, V.WOTLK, 110, 115, 120, 125)
 	self:AddRecipeFlags(57163, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57163, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57163, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Resonating Power -- 57164
 	AddRecipe(57164, 385, 43430, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -801,7 +801,7 @@ function addon:InitInscription()
 	-- Glyph of Revenge -- 57165
 	AddRecipe(57165, 190, 43424, Q.COMMON, V.WOTLK, 190, 195, 200, 205)
 	self:AddRecipeFlags(57165, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57165, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57165, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Last Stand -- 57166
 	AddRecipe(57166, 385, 43426, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -811,7 +811,7 @@ function addon:InitInscription()
 	-- Glyph of Sunder Armor -- 57167
 	AddRecipe(57167, 140, 43427, Q.COMMON, V.WOTLK, 140, 145, 150, 155)
 	self:AddRecipeFlags(57167, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARRIOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeTrainer(57167, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57167, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Sweeping Strikes -- 57168
 	AddRecipe(57168, 320, 43428, Q.COMMON, V.WOTLK, 320, 325, 330, 335)
@@ -841,22 +841,22 @@ function addon:InitInscription()
 	-- Glyph of Dispel Magic -- 57183
 	AddRecipe(57183, 230, 42397, Q.COMMON, V.WOTLK, 230, 235, 240, 245)
 	self:AddRecipeFlags(57183, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(57183, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57183, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Fade -- 57184
 	AddRecipe(57184, 105, 42398, Q.COMMON, V.WOTLK, 105, 110, 115, 120)
 	self:AddRecipeFlags(57184, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(57184, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57184, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Fear Ward -- 57185
 	AddRecipe(57185, 270, 42399, Q.COMMON, V.WOTLK, 270, 275, 280, 285)
 	self:AddRecipeFlags(57185, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(57185, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57185, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Flash Heal -- 57186
 	AddRecipe(57186, 120, 42400, Q.COMMON, V.WOTLK, 120, 125, 130, 135)
 	self:AddRecipeFlags(57186, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.HEALER)
-	self:AddRecipeTrainer(57186, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57186, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Holy Nova -- 57187
 	AddRecipe(57187, 315, 42401, Q.COMMON, V.WOTLK, 315, 320, 325, 330)
@@ -866,7 +866,7 @@ function addon:InitInscription()
 	-- Glyph of Inner Fire -- 57188
 	AddRecipe(57188, 135, 42402, Q.COMMON, V.WOTLK, 135, 140, 145, 150)
 	self:AddRecipeFlags(57188, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(57188, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57188, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Lightwell -- 57189
 	AddRecipe(57189, 385, 42403, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -896,7 +896,7 @@ function addon:InitInscription()
 	-- Glyph of Power Word: Shield -- 57194
 	AddRecipe(57194, 80, 42408, Q.COMMON, V.WOTLK, 80, 90, 100, 110)
 	self:AddRecipeFlags(57194, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.HEALER)
-	self:AddRecipeTrainer(57194, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57194, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Prayer of Healing -- 57195
 	AddRecipe(57195, 385, 42409, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -906,12 +906,12 @@ function addon:InitInscription()
 	-- Glyph of Psychic Scream -- 57196
 	AddRecipe(57196, 95, 42410, Q.COMMON, V.WOTLK, 95, 105, 115, 125)
 	self:AddRecipeFlags(57196, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(57196, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 30711, 33615, 26995, 33679, 26977, 30713, 28702)
+	self:AddRecipeTrainer(57196, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 26959, 30710, 30711, 30715, 33679, 26977, 30713, 33615)

 	-- Glyph of Renew -- 57197
 	AddRecipe(57197, 160, 42411, Q.COMMON, V.WOTLK, 160, 165, 170, 175)
 	self:AddRecipeFlags(57197, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.HEALER)
-	self:AddRecipeTrainer(57197, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57197, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Scourge Imprisonment -- 57198
 	AddRecipe(57198, 375, 42412, Q.COMMON, V.WOTLK, 375, 380, 385, 390)
@@ -926,12 +926,12 @@ function addon:InitInscription()
 	-- Glyph of Mind Flay -- 57200
 	AddRecipe(57200, 180, 42415, Q.COMMON, V.WOTLK, 180, 185, 190, 195)
 	self:AddRecipeFlags(57200, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57200, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57200, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Smite -- 57201
 	AddRecipe(57201, 210, 42416, Q.COMMON, V.WOTLK, 210, 215, 220, 225)
 	self:AddRecipeFlags(57201, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57201, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57201, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Spirit of Redemption -- 57202
 	AddRecipe(57202, 385, 42417, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -956,7 +956,7 @@ function addon:InitInscription()
 	-- Glyph of Bone Shield -- 57210
 	AddRecipe(57210, 265, 43536, Q.COMMON, V.WOTLK, 265, 270, 275, 280)
 	self:AddRecipeFlags(57210, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57210, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57210, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Chains of Ice -- 57211
 	AddRecipe(57211, 385, 43537, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -971,7 +971,7 @@ function addon:InitInscription()
 	-- Glyph of Death Grip -- 57213
 	AddRecipe(57213, 285, 43541, Q.COMMON, V.WOTLK, 285, 290, 295, 300)
 	self:AddRecipeFlags(57213, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57213, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57213, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Death and Decay -- 57214
 	AddRecipe(57214, 385, 43542, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -986,7 +986,7 @@ function addon:InitInscription()
 	-- Glyph of Frost Strike -- 57216
 	AddRecipe(57216, 270, 43543, Q.COMMON, V.WOTLK, 270, 275, 280, 285)
 	self:AddRecipeFlags(57216, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57216, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57216, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Horn of Winter -- 57217
 	AddRecipe(57217, 320, 43544, Q.COMMON, V.WOTLK, 320, 330, 335, 340)
@@ -1001,7 +1001,7 @@ function addon:InitInscription()
 	-- Glyph of Icy Touch -- 57219
 	AddRecipe(57219, 280, 43546, Q.COMMON, V.WOTLK, 280, 285, 290, 295)
 	self:AddRecipeFlags(57219, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57219, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 30711, 33615, 26995, 33679, 26977, 30713, 28702)
+	self:AddRecipeTrainer(57219, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 26959, 30710, 30711, 30715, 33679, 26977, 30713, 33615)

 	-- Glyph of Obliterate -- 57220
 	AddRecipe(57220, 385, 43547, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1091,27 +1091,27 @@ function addon:InitInscription()
 	-- Glyph of Fire Nova -- 57238
 	AddRecipe(57238, 110, 41530, Q.COMMON, V.WOTLK, 110, 115, 120, 125)
 	self:AddRecipeFlags(57238, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57238, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57238, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Flame Shock -- 57239
 	AddRecipe(57239, 85, 41531, Q.COMMON, V.WOTLK, 85, 95, 105, 115)
 	self:AddRecipeFlags(57239, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57239, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57239, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Flametongue Weapon -- 57240
 	AddRecipe(57240, 125, 41532, Q.COMMON, V.WOTLK, 125, 130, 135, 140)
 	self:AddRecipeFlags(57240, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57240, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57240, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Frost Shock -- 57241
 	AddRecipe(57241, 185, 41547, Q.COMMON, V.WOTLK, 185, 190, 195, 200)
 	self:AddRecipeFlags(57241, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57241, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57241, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Healing Stream Totem -- 57242
 	AddRecipe(57242, 215, 41533, Q.COMMON, V.WOTLK, 215, 220, 225, 230)
 	self:AddRecipeFlags(57242, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP, F.HEALER)
-	self:AddRecipeTrainer(57242, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57242, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Healing Wave -- 57243
 	AddRecipe(57243, 385, 41534, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1121,17 +1121,17 @@ function addon:InitInscription()
 	-- Glyph of Lesser Healing Wave -- 57244
 	AddRecipe(57244, 235, 41535, Q.COMMON, V.WOTLK, 235, 240, 245, 250)
 	self:AddRecipeFlags(57244, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP, F.HEALER)
-	self:AddRecipeTrainer(57244, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57244, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Lightning Bolt -- 57245
 	AddRecipe(57245, 140, 41536, Q.COMMON, V.WOTLK, 140, 145, 150, 155)
 	self:AddRecipeFlags(57245, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57245, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57245, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Lightning Shield -- 57246
 	AddRecipe(57246, 95, 41537, Q.COMMON, V.WOTLK, 95, 105, 115, 125)
 	self:AddRecipeFlags(57246, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57246, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57246, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Mana Tide Totem -- 57247
 	AddRecipe(57247, 385, 41538, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1146,7 +1146,7 @@ function addon:InitInscription()
 	-- Glyph of Lava Lash -- 57249
 	AddRecipe(57249, 165, 41540, Q.COMMON, V.WOTLK, 165, 170, 175, 180)
 	self:AddRecipeFlags(57249, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57249, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57249, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Elemental Mastery -- 57250
 	AddRecipe(57250, 385, 41552, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1156,7 +1156,7 @@ function addon:InitInscription()
 	-- Glyph of Water Mastery -- 57251
 	AddRecipe(57251, 275, 41541, Q.COMMON, V.WOTLK, 275, 280, 285, 290)
 	self:AddRecipeFlags(57251, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57251, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57251, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Windfury Weapon -- 57252
 	AddRecipe(57252, 330, 41542, Q.COMMON, V.WOTLK, 330, 335, 340, 345)
@@ -1181,7 +1181,7 @@ function addon:InitInscription()
 	-- Glyph of Corruption -- 57259
 	AddRecipe(57259, 85, 42455, Q.COMMON, V.WOTLK, 85, 95, 105, 115)
 	self:AddRecipeFlags(57259, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57259, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57259, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Curse of Agony -- 57260
 	AddRecipe(57260, 385, 42456, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1196,7 +1196,7 @@ function addon:InitInscription()
 	-- Glyph of Fear -- 57262
 	AddRecipe(57262, 125, 42458, Q.COMMON, V.WOTLK, 125, 130, 135, 140)
 	self:AddRecipeFlags(57262, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57262, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57262, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Felguard -- 57263
 	AddRecipe(57263, 385, 42459, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1211,12 +1211,12 @@ function addon:InitInscription()
 	-- Glyph of Health Funnel -- 57265
 	AddRecipe(57265, 110, 42461, Q.COMMON, V.WOTLK, 110, 115, 120, 125)
 	self:AddRecipeFlags(57265, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57265, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57265, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Healthstone -- 57266
 	AddRecipe(57266, 95, 42462, Q.COMMON, V.WOTLK, 95, 105, 115, 125)
 	self:AddRecipeFlags(57266, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57266, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57266, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Howl of Terror -- 57267
 	AddRecipe(57267, 385, 42463, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1231,22 +1231,22 @@ function addon:InitInscription()
 	-- Glyph of Imp -- 57269
 	AddRecipe(57269, 140, 42465, Q.COMMON, V.WOTLK, 140, 145, 150, 155)
 	self:AddRecipeFlags(57269, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57269, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 30711, 33615, 26995, 33679, 26977, 30713, 28702)
+	self:AddRecipeTrainer(57269, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 26959, 30710, 30711, 30715, 33679, 26977, 30713, 33615)

 	-- Glyph of Searing Pain -- 57270
 	AddRecipe(57270, 215, 42466, Q.COMMON, V.WOTLK, 215, 220, 225, 230)
 	self:AddRecipeFlags(57270, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57270, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 30711, 33615, 26995, 33679, 26977, 30713, 28702)
+	self:AddRecipeTrainer(57270, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 26959, 30710, 30711, 30715, 33679, 26977, 30713, 33615)

 	-- Glyph of Shadow Bolt -- 57271
 	AddRecipe(57271, 165, 42467, Q.COMMON, V.WOTLK, 165, 170, 175, 180)
 	self:AddRecipeFlags(57271, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57271, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57271, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Shadowburn -- 57272
 	AddRecipe(57272, 275, 42468, Q.COMMON, V.WOTLK, 275, 280, 285, 290)
 	self:AddRecipeFlags(57272, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57272, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57272, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Siphon Life -- 57273
 	AddRecipe(57273, 385, 42469, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1256,7 +1256,7 @@ function addon:InitInscription()
 	-- Glyph of Soulstone -- 57274
 	AddRecipe(57274, 240, 42470, Q.COMMON, V.WOTLK, 240, 245, 250, 255)
 	self:AddRecipeFlags(57274, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57274, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57274, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Succubus -- 57275
 	AddRecipe(57275, 325, 42471, Q.COMMON, V.WOTLK, 325, 330, 335, 340)
@@ -1271,57 +1271,57 @@ function addon:InitInscription()
 	-- Glyph of Voidwalker -- 57277
 	AddRecipe(57277, 190, 42473, Q.COMMON, V.WOTLK, 190, 195, 200, 205)
 	self:AddRecipeFlags(57277, F.ALLIANCE, F.HORDE, F.TRAINER, F.WARLOCK, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(57277, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57277, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Hunter's Ink -- 57703
 	AddRecipe(57703, 85, 43115, Q.UNCOMMON, V.WOTLK, 85, 85, 90, 95)
 	self:AddRecipeFlags(57703, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57703, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57703, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Lion's Ink -- 57704
 	AddRecipe(57704, 100, 43116, Q.COMMON, V.WOTLK, 100, 100, 100, 105)
 	self:AddRecipeFlags(57704, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57704, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57704, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Dawnstar Ink -- 57706
 	AddRecipe(57706, 125, 43117, Q.UNCOMMON, V.WOTLK, 125, 125, 130, 135)
 	self:AddRecipeFlags(57706, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57706, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57706, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Jadefire Ink -- 57707
 	AddRecipe(57707, 150, 43118, Q.COMMON, V.WOTLK, 150, 150, 150, 155)
 	self:AddRecipeFlags(57707, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57707, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57707, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Royal Ink -- 57708
 	AddRecipe(57708, 175, 43119, Q.UNCOMMON, V.WOTLK, 175, 175, 175, 180)
 	self:AddRecipeFlags(57708, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57708, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57708, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Celestial Ink -- 57709
 	AddRecipe(57709, 200, 43120, Q.COMMON, V.WOTLK, 200, 200, 200, 205)
 	self:AddRecipeFlags(57709, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57709, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 30711, 33615, 26995, 33679, 26977, 30713, 28702)
+	self:AddRecipeTrainer(57709, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 26959, 30710, 30711, 30715, 33679, 26977, 30713, 33615)

 	-- Fiery Ink -- 57710
 	AddRecipe(57710, 225, 43121, Q.UNCOMMON, V.WOTLK, 225, 225, 225, 230)
 	self:AddRecipeFlags(57710, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57710, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57710, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Shimmering Ink -- 57711
 	AddRecipe(57711, 250, 43122, Q.COMMON, V.WOTLK, 250, 250, 250, 255)
 	self:AddRecipeFlags(57711, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57711, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57711, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Ink of the Sky -- 57712
 	AddRecipe(57712, 275, 43123, Q.UNCOMMON, V.WOTLK, 275, 290, 295, 300)
 	self:AddRecipeFlags(57712, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57712, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57712, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Ethereal Ink -- 57713
 	AddRecipe(57713, 290, 43124, Q.COMMON, V.WOTLK, 290, 295, 300, 305)
 	self:AddRecipeFlags(57713, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(57713, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(57713, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Darkflame Ink -- 57714
 	AddRecipe(57714, 325, 43125, Q.UNCOMMON, V.WOTLK, 325, 325, 325, 330)
@@ -1606,32 +1606,32 @@ function addon:InitInscription()
 	-- Scroll of Agility -- 58472
 	AddRecipe(58472, 15, 3012, Q.COMMON, V.WOTLK, 15, 35, 40, 45)
 	self:AddRecipeFlags(58472, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58472, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58472, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Agility II -- 58473
 	AddRecipe(58473, 85, 1477, Q.COMMON, V.WOTLK, 85, 85, 90, 95)
 	self:AddRecipeFlags(58473, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58473, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58473, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Agility III -- 58476
 	AddRecipe(58476, 175, 4425, Q.COMMON, V.WOTLK, 175, 180, 185, 190)
 	self:AddRecipeFlags(58476, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58476, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58476, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Agility IV -- 58478
 	AddRecipe(58478, 225, 10309, Q.COMMON, V.WOTLK, 225, 230, 235, 240)
 	self:AddRecipeFlags(58478, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58478, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58478, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Agility V -- 58480
 	AddRecipe(58480, 270, 27498, Q.COMMON, V.WOTLK, 270, 275, 280, 285)
 	self:AddRecipeFlags(58480, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58480, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58480, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Agility VI -- 58481
 	AddRecipe(58481, 310, 33457, Q.COMMON, V.WOTLK, 310, 320, 325, 330)
 	self:AddRecipeFlags(58481, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58481, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58481, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Agility VII -- 58482
 	AddRecipe(58482, 370, 43463, Q.COMMON, V.WOTLK, 370, 375, 380, 385)
@@ -1646,32 +1646,32 @@ function addon:InitInscription()
 	-- Scroll of Strength -- 58484
 	AddRecipe(58484, 15, 954, Q.COMMON, V.WOTLK, 15, 35, 40, 45)
 	self:AddRecipeFlags(58484, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58484, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58484, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Strength II -- 58485
 	AddRecipe(58485, 80, 2289, Q.COMMON, V.WOTLK, 80, 80, 85, 90)
 	self:AddRecipeFlags(58485, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58485, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58485, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Strength III -- 58486
 	AddRecipe(58486, 170, 4426, Q.COMMON, V.WOTLK, 170, 175, 180, 185)
 	self:AddRecipeFlags(58486, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58486, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58486, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Strength IV -- 58487
 	AddRecipe(58487, 220, 10310, Q.COMMON, V.WOTLK, 220, 225, 230, 235)
 	self:AddRecipeFlags(58487, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58487, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58487, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Strength V -- 58488
 	AddRecipe(58488, 265, 27503, Q.COMMON, V.WOTLK, 265, 270, 275, 280)
 	self:AddRecipeFlags(58488, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58488, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58488, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Strength VI -- 58489
 	AddRecipe(58489, 305, 33462, Q.COMMON, V.WOTLK, 305, 315, 320, 325)
 	self:AddRecipeFlags(58489, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeTrainer(58489, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58489, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Strength VII -- 58490
 	AddRecipe(58490, 365, 43465, Q.COMMON, V.WOTLK, 365, 370, 375, 380)
@@ -1686,7 +1686,7 @@ function addon:InitInscription()
 	-- Mystic Tome -- 58565
 	AddRecipe(58565, 110, 43515, Q.RARE, V.WOTLK, 110, 125, 137, 150)
 	self:AddRecipeFlags(58565, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND)
-	self:AddRecipeTrainer(58565, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(58565, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Dash -- 59315
 	AddRecipe(59315, 150, 43674, Q.COMMON, V.WOTLK, 150, 155, 160, 165)
@@ -1716,67 +1716,67 @@ function addon:InitInscription()
 	-- Certificate of Ownership -- 59387
 	AddRecipe(59387, 200, 43850, Q.COMMON, V.WOTLK, 200, 205, 210, 215)
 	self:AddRecipeFlags(59387, F.ALLIANCE, F.HORDE, F.TRAINER, F.HUNTER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59387, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 30711, 33615, 26995, 33679, 26977, 30713, 28702)
+	self:AddRecipeTrainer(59387, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 26959, 30710, 30711, 30715, 33679, 26977, 30713, 33615)

 	-- Tome of the Dawn -- 59475
 	AddRecipe(59475, 125, 43654, Q.RARE, V.WOTLK, 125, 150, 162, 175)
 	self:AddRecipeFlags(59475, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND)
-	self:AddRecipeTrainer(59475, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59475, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Book of Survival -- 59478
 	AddRecipe(59478, 125, 43655, Q.RARE, V.WOTLK, 125, 150, 162, 175)
 	self:AddRecipeFlags(59478, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND)
-	self:AddRecipeTrainer(59478, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59478, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Strange Tarot -- 59480
 	AddRecipe(59480, 125, nil, Q.COMMON, V.WOTLK, 125, 150, 162, 175)
 	self:AddRecipeFlags(59480, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59480, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59480, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Tome of Kings -- 59484
 	AddRecipe(59484, 175, 43656, Q.RARE, V.WOTLK, 175, 200, 205, 210)
 	self:AddRecipeFlags(59484, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND)
-	self:AddRecipeTrainer(59484, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59484, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Royal Guide of Escape Routes -- 59486
 	AddRecipe(59486, 175, 43657, Q.RARE, V.WOTLK, 175, 200, 205, 210)
 	self:AddRecipeFlags(59486, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND)
-	self:AddRecipeTrainer(59486, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59486, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Arcane Tarot -- 59487
 	AddRecipe(59487, 175, nil, Q.COMMON, V.WOTLK, 175, 200, 205, 210)
 	self:AddRecipeFlags(59487, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59487, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59487, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Weapon Vellum II -- 59488
 	AddRecipe(59488, 235, 39350, Q.COMMON, V.WOTLK, 235, 250, 255, 260)
 	self:AddRecipeFlags(59488, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59488, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59488, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Fire Eater's Guide -- 59489
 	AddRecipe(59489, 225, 43660, Q.RARE, V.WOTLK, 225, 240, 245, 250)
 	self:AddRecipeFlags(59489, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND)
-	self:AddRecipeTrainer(59489, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59489, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Book of Stars -- 59490
 	AddRecipe(59490, 225, 43661, Q.RARE, V.WOTLK, 225, 240, 245, 250)
 	self:AddRecipeFlags(59490, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.ONE_HAND)
-	self:AddRecipeTrainer(59490, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59490, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Shadowy Tarot -- 59491
 	AddRecipe(59491, 225, nil, Q.COMMON, V.WOTLK, 225, 240, 245, 250)
 	self:AddRecipeFlags(59491, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59491, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59491, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Stormbound Tome -- 59493
 	AddRecipe(59493, 275, 43663, Q.RARE, V.WOTLK, 275, 290, 295, 300)
 	self:AddRecipeFlags(59493, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.ONE_HAND)
-	self:AddRecipeTrainer(59493, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59493, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Manual of Clouds -- 59494
 	AddRecipe(59494, 275, 43664, Q.RARE, V.WOTLK, 275, 290, 295, 300)
 	self:AddRecipeFlags(59494, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.ONE_HAND)
-	self:AddRecipeTrainer(59494, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59494, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Hellfire Tome -- 59495
 	AddRecipe(59495, 325, 43666, Q.RARE, V.WOTLK, 325, 340, 345, 350)
@@ -1801,7 +1801,7 @@ function addon:InitInscription()
 	-- Armor Vellum II -- 59499
 	AddRecipe(59499, 200, 37602, Q.COMMON, V.WOTLK, 200, 210, 215, 220)
 	self:AddRecipeFlags(59499, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59499, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59499, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Armor Vellum III -- 59500
 	AddRecipe(59500, 350, 43145, Q.COMMON, V.WOTLK, 350, 355, 370, 385)
@@ -1816,7 +1816,7 @@ function addon:InitInscription()
 	-- Darkmoon Card -- 59502
 	AddRecipe(59502, 275, nil, Q.COMMON, V.WOTLK, 275, 290, 295, 300)
 	self:AddRecipeFlags(59502, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(59502, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(59502, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Greater Darkmoon Card -- 59503
 	AddRecipe(59503, 325, nil, Q.COMMON, V.WOTLK, 325, 340, 345, 350)
@@ -1846,7 +1846,7 @@ function addon:InitInscription()
 	-- Scroll of Recall II -- 60336
 	AddRecipe(60336, 200, 44314, Q.COMMON, V.WOTLK, 200, 215, 220, 225)
 	self:AddRecipeFlags(60336, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(60336, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(60336, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Scroll of Recall III -- 60337
 	AddRecipe(60337, 350, 44315, Q.COMMON, V.WOTLK, 350, 350, 350, 355)
@@ -1876,12 +1876,12 @@ function addon:InitInscription()
 	-- Northrend Inscription Research -- 61177
 	AddRecipe(61177, 385, nil, Q.COMMON, V.WOTLK, 385, 425, 437, 450)
 	self:AddRecipeFlags(61177, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(61177, 26977, 26916, 26959, 26995, 33679, 33603, 28702)
+	self:AddRecipeTrainer(61177, 26977, 26916, 26959, 26995, 28702, 33603, 33679)

 	-- Minor Inscription Research -- 61288
 	AddRecipe(61288, 75, nil, Q.COMMON, V.WOTLK, 75, 125, 137, 150)
 	self:AddRecipeFlags(61288, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(61288, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 33615, 30711, 26995, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(61288, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 33615, 30715, 33679, 26977, 30713, 30711)

 	-- Glyph of Frostfire -- 61677
 	AddRecipe(61677, 385, 44684, Q.COMMON, V.WOTLK, 385, 390, 397, 405)
@@ -1966,37 +1966,37 @@ function addon:InitInscription()
 	-- Glyph of Monsoon -- 64258
 	AddRecipe(64258, 250, 45622, Q.COMMON, V.WOTLK, 250, 255, 262, 270)
 	self:AddRecipeFlags(64258, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(64258, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 30711, 33615, 30715, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(64258, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 30711, 26995, 33679, 26977, 30713, 33615)

 	-- Glyph of Pain Suppression -- 64259
 	AddRecipe(64259, 255, 45760, Q.COMMON, V.WOTLK, 255, 255, 262, 270)
 	self:AddRecipeFlags(64259, F.ALLIANCE, F.HORDE, F.TRAINER, F.PRIEST, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(64259, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 28702, 33615, 30711, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(64259, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 30710, 26959, 33615, 30711, 33679, 26977, 30713, 28702)

 	-- Glyph of Mutilate -- 64260
 	AddRecipe(64260, 255, 45768, Q.COMMON, V.WOTLK, 255, 255, 262, 270)
 	self:AddRecipeFlags(64260, F.ALLIANCE, F.HORDE, F.TRAINER, F.ROGUE, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(64260, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 30711, 33615, 30715, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(64260, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 30711, 26995, 33679, 26977, 30713, 33615)

 	-- Glyph of Earth Shield -- 64261
 	AddRecipe(64261, 250, 45775, Q.COMMON, V.WOTLK, 250, 255, 262, 270)
 	self:AddRecipeFlags(64261, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(64261, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 30711, 33615, 30715, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(64261, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 30711, 26995, 33679, 26977, 30713, 33615)

 	-- Glyph of Totem of Wrath -- 64262
 	AddRecipe(64262, 255, 45776, Q.COMMON, V.WOTLK, 255, 255, 262, 270)
 	self:AddRecipeFlags(64262, F.ALLIANCE, F.HORDE, F.TRAINER, F.SHAMAN, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(64262, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 30711, 33615, 30715, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(64262, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 30711, 26995, 33679, 26977, 30713, 33615)

 	-- Glyph of Dark Death -- 64266
 	AddRecipe(64266, 275, 45804, Q.COMMON, V.WOTLK, 275, 280, 287, 295)
 	self:AddRecipeFlags(64266, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(64266, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 30711, 33615, 30715, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(64266, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 30711, 26995, 33679, 26977, 30713, 33615)

 	-- Glyph of Disease -- 64267
 	AddRecipe(64267, 280, 45805, Q.COMMON, V.WOTLK, 280, 285, 290, 295)
 	self:AddRecipeFlags(64267, F.ALLIANCE, F.HORDE, F.TRAINER, F.DK, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(64267, 26916, 26995, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 28702, 30710, 30711, 33615, 30715, 33679, 26977, 30713, 26959)
+	self:AddRecipeTrainer(64267, 26916, 30715, 30716, 30717, 33603, 30721, 30706, 30722, 30709, 26959, 30710, 28702, 30711, 26995, 33679, 26977, 30713, 33615)

 	-- Glyph of Berserk -- 64268
 	AddRecipe(64268, 425, 45601, Q.COMMON, V.WOTLK, 425, 430, 435, 440)
@@ -2226,7 +2226,7 @@ function addon:InitInscription()
 	-- Glyph of Claw -- 67600
 	AddRecipe(67600, 100, 48720, Q.COMMON, V.WOTLK, 100, 105, 110, 115)
 	self:AddRecipeFlags(67600, F.ALLIANCE, F.HORDE, F.TRAINER, F.DRUID, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(67600, 30722, 33679, 28702, 26959, 30706, 33603, 30710)
+	self:AddRecipeTrainer(67600, 30722, 33679, 28702, 30710, 30706, 33603, 26959)

 	-- Glyph of Command -- 68166
 	AddRecipe(68166, 355, 49084, Q.COMMON, V.WOTLK, 355, 355, 360, 365)
diff --git a/Database/Jewelcrafting.lua b/Database/Jewelcrafting.lua
index 89fb171..592b536 100644
--- a/Database/Jewelcrafting.lua
+++ b/Database/Jewelcrafting.lua
@@ -58,52 +58,52 @@ function addon:InitJewelcrafting()
 	-- Bronze Setting -- 25278
 	AddRecipe(25278, 50, 20817, Q.COMMON, V.TBC, 50, 70, 80, 90)
 	self:AddRecipeFlags(25278, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(25278, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(25278, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Elegant Silver Ring -- 25280
 	AddRecipe(25280, 50, 20818, Q.COMMON, V.TBC, 50, 80, 95, 110)
 	self:AddRecipeFlags(25280, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(25280, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(25280, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Inlaid Malachite Ring -- 25283
 	AddRecipe(25283, 30, 20821, Q.COMMON, V.TBC, 30, 60, 75, 90)
 	self:AddRecipeFlags(25283, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(25283, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(25283, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Simple Pearl Ring -- 25284
 	AddRecipe(25284, 60, 20820, Q.COMMON, V.TBC, 60, 90, 105, 120)
 	self:AddRecipeFlags(25284, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(25284, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(25284, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Gloom Band -- 25287
 	AddRecipe(25287, 70, 20823, Q.COMMON, V.TBC, 70, 100, 115, 130)
 	self:AddRecipeFlags(25287, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(25287, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(25287, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Heavy Silver Ring -- 25305
 	AddRecipe(25305, 90, 20826, Q.COMMON, V.TBC, 90, 120, 135, 150)
 	self:AddRecipeFlags(25305, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(25305, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25305, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Ring of Silver Might -- 25317
 	AddRecipe(25317, 80, 20827, Q.COMMON, V.TBC, 80, 110, 125, 140)
 	self:AddRecipeFlags(25317, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(25317, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25317, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Ring of Twilight Shadows -- 25318
 	AddRecipe(25318, 100, 20828, Q.COMMON, V.TBC, 100, 130, 145, 160)
 	self:AddRecipeFlags(25318, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(25318, 33614, 33680, 26960, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25318, 33614, 18774, 28701, 15501, 19775, 19778, 26982, 18751, 26960, 19539, 19063, 26997, 33680, 33590)

 	-- Heavy Golden Necklace of Battle -- 25320
 	AddRecipe(25320, 150, 20856, Q.COMMON, V.TBC, 150, 180, 195, 210)
 	self:AddRecipeFlags(25320, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.DPS, F.NECK)
-	self:AddRecipeVendor(25320, 1286, 17512, 3367, 16624)
+	self:AddRecipeVendor(25320, 17512, 16624, 3367, 1286)

 	-- Moonsoul Crown -- 25321
 	AddRecipe(25321, 120, 20832, Q.COMMON, V.TBC, 120, 150, 165, 180)
 	self:AddRecipeFlags(25321, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(25321, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25321, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Wicked Moonstone Ring -- 25323
 	AddRecipe(25323, 125, 20833, Q.COMMON, V.TBC, 125, 155, 170, 185)
@@ -118,7 +118,7 @@ function addon:InitJewelcrafting()
 	-- Solid Bronze Ring -- 25490
 	AddRecipe(25490, 50, 20907, Q.COMMON, V.TBC, 50, 80, 95, 110)
 	self:AddRecipeFlags(25490, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(25490, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(25490, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Braided Copper Ring -- 25493
 	AddRecipe(25493, 1, 20906, Q.UNCOMMON, V.TBC, 1, 30, 45, 60)
@@ -128,7 +128,7 @@ function addon:InitJewelcrafting()
 	-- Barbaric Iron Collar -- 25498
 	AddRecipe(25498, 110, 20909, Q.COMMON, V.TBC, 110, 140, 155, 170)
 	self:AddRecipeFlags(25498, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.NECK)
-	self:AddRecipeTrainer(25498, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25498, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Pendant of the Agate Shield -- 25610
 	AddRecipe(25610, 120, 20950, Q.COMMON, V.TBC, 120, 150, 165, 180)
@@ -143,12 +143,12 @@ function addon:InitJewelcrafting()
 	-- Golden Dragon Ring -- 25613
 	AddRecipe(25613, 135, 20955, Q.COMMON, V.TBC, 135, 165, 180, 195)
 	self:AddRecipeFlags(25613, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.RING)
-	self:AddRecipeTrainer(25613, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25613, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Mithril Filigree -- 25615
 	AddRecipe(25615, 150, 20963, Q.COMMON, V.TBC, 150, 170, 180, 190)
 	self:AddRecipeFlags(25615, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(25615, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25615, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Blazing Citrine Ring -- 25617
 	AddRecipe(25617, 150, 20958, Q.COMMON, V.TBC, 150, 180, 195, 210)
@@ -158,42 +158,42 @@ function addon:InitJewelcrafting()
 	-- Jade Pendant of Blasting -- 25618
 	AddRecipe(25618, 160, 20966, Q.UNCOMMON, V.TBC, 160, 190, 205, 220)
 	self:AddRecipeFlags(25618, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeAcquire(25618, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(25618, 2)

 	-- The Jade Eye -- 25619
 	AddRecipe(25619, 170, 20959, Q.COMMON, V.TBC, 170, 200, 215, 230)
 	self:AddRecipeFlags(25619, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.TANK, F.RING)
-	self:AddRecipeVendor(25619, 5163, 17512, 4775, 16624)
+	self:AddRecipeVendor(25619, 17512, 16624, 4775, 5163)

 	-- Engraved Truesilver Ring -- 25620
 	AddRecipe(25620, 170, 20960, Q.COMMON, V.TBC, 170, 200, 215, 230)
 	self:AddRecipeFlags(25620, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(25620, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25620, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Citrine Ring of Rapid Healing -- 25621
 	AddRecipe(25621, 180, 20961, Q.COMMON, V.TBC, 180, 210, 225, 240)
 	self:AddRecipeFlags(25621, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(25621, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(25621, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Citrine Pendant of Golden Healing -- 25622
 	AddRecipe(25622, 190, 20967, Q.UNCOMMON, V.TBC, 190, 220, 235, 250)
 	self:AddRecipeFlags(25622, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeAcquire(25622, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(25622, 2)

 	-- Figurine - Jade Owl -- 26872
 	AddRecipe(26872, 200, 21748, Q.COMMON, V.TBC, 200, 225, 240, 255)
 	self:AddRecipeFlags(26872, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.HEALER, F.CASTER, F.TRINKET)
-	self:AddRecipeTrainer(26872, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26872, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Figurine - Golden Hare -- 26873
 	AddRecipe(26873, 200, 21756, Q.UNCOMMON, V.TBC, 200, 225, 240, 255)
 	self:AddRecipeFlags(26873, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOP, F.RBOE, F.TRINKET)
-	self:AddRecipeAcquire(26873, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(26873, 2)

 	-- Aquamarine Signet -- 26874
 	AddRecipe(26874, 210, 20964, Q.COMMON, V.TBC, 210, 235, 250, 265)
 	self:AddRecipeFlags(26874, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(26874, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26874, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Figurine - Black Pearl Panther -- 26875
 	AddRecipe(26875, 215, 21758, Q.COMMON, V.TBC, 215, 240, 255, 270)
@@ -203,7 +203,7 @@ function addon:InitJewelcrafting()
 	-- Aquamarine Pendant of the Warrior -- 26876
 	AddRecipe(26876, 220, 21755, Q.COMMON, V.TBC, 220, 245, 260, 275)
 	self:AddRecipeFlags(26876, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.NECK)
-	self:AddRecipeTrainer(26876, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26876, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Ruby Crown of Restoration -- 26878
 	AddRecipe(26878, 225, 20969, Q.COMMON, V.TBC, 225, 250, 265, 280)
@@ -213,7 +213,7 @@ function addon:InitJewelcrafting()
 	-- Thorium Setting -- 26880
 	AddRecipe(26880, 225, 21752, Q.COMMON, V.TBC, 225, 235, 245, 255)
 	self:AddRecipeFlags(26880, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(26880, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26880, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Figurine - Truesilver Crab -- 26881
 	AddRecipe(26881, 225, 21760, Q.COMMON, V.TBC, 225, 250, 265, 280)
@@ -223,47 +223,47 @@ function addon:InitJewelcrafting()
 	-- Figurine - Truesilver Boar -- 26882
 	AddRecipe(26882, 235, 21763, Q.UNCOMMON, V.TBC, 235, 260, 275, 290)
 	self:AddRecipeFlags(26882, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOP, F.RBOE, F.DPS, F.TRINKET)
-	self:AddRecipeAcquire(26882, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(26882, 2)

 	-- Ruby Pendant of Fire -- 26883
 	AddRecipe(26883, 235, 21764, Q.COMMON, V.TBC, 235, 260, 275, 290)
 	self:AddRecipeFlags(26883, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeTrainer(26883, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26883, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Truesilver Healing Ring -- 26885
 	AddRecipe(26885, 240, 21765, Q.COMMON, V.TBC, 240, 265, 280, 295)
 	self:AddRecipeFlags(26885, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(26885, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26885, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- The Aquamarine Ward -- 26887
 	AddRecipe(26887, 245, 21754, Q.UNCOMMON, V.TBC, 245, 270, 285, 300)
 	self:AddRecipeFlags(26887, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.RING)
-	self:AddRecipeAcquire(26887, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(26887, 2)

 	-- Gem Studded Band -- 26896
 	AddRecipe(26896, 250, 21753, Q.UNCOMMON, V.TBC, 250, 275, 290, 305)
 	self:AddRecipeFlags(26896, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeAcquire(26896, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(26896, 2)

 	-- Opal Necklace of Impact -- 26897
 	AddRecipe(26897, 250, 21766, Q.COMMON, V.TBC, 250, 275, 290, 305)
 	self:AddRecipeFlags(26897, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.DPS, F.NECK)
-	self:AddRecipeVendor(26897, 8363, 17512, 16624, 5163)
+	self:AddRecipeVendor(26897, 17512, 5163, 16624, 8363)

 	-- Figurine - Ruby Serpent -- 26900
 	AddRecipe(26900, 260, 21769, Q.UNCOMMON, V.TBC, 260, 280, 290, 300)
 	self:AddRecipeFlags(26900, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOP, F.RBOE, F.HEALER, F.CASTER, F.TRINKET)
-	self:AddRecipeAcquire(26900, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(26900, 2)

 	-- Simple Opal Ring -- 26902
 	AddRecipe(26902, 260, 21767, Q.COMMON, V.TBC, 260, 280, 290, 300)
 	self:AddRecipeFlags(26902, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(26902, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26902, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Sapphire Signet -- 26903
 	AddRecipe(26903, 275, 21768, Q.COMMON, V.TBC, 275, 285, 295, 305)
 	self:AddRecipeFlags(26903, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(26903, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26903, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Emerald Crown of Destruction -- 26906
 	AddRecipe(26906, 275, 21774, Q.COMMON, V.TBC, 275, 285, 295, 305)
@@ -273,17 +273,17 @@ function addon:InitJewelcrafting()
 	-- Onslaught Ring -- 26907
 	AddRecipe(26907, 280, 21775, Q.COMMON, V.TBC, 280, 290, 300, 310)
 	self:AddRecipeFlags(26907, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(26907, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26907, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Sapphire Pendant of Winter Night -- 26908
 	AddRecipe(26908, 280, 21790, Q.COMMON, V.TBC, 280, 290, 300, 310)
 	self:AddRecipeFlags(26908, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeTrainer(26908, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26908, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Figurine - Emerald Owl -- 26909
 	AddRecipe(26909, 285, 21777, Q.UNCOMMON, V.TBC, 285, 295, 305, 315)
 	self:AddRecipeFlags(26909, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOP, F.RBOE, F.HEALER, F.CASTER, F.TRINKET)
-	self:AddRecipeAcquire(26909, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(26909, 2)

 	-- Ring of Bitter Shadows -- 26910
 	AddRecipe(26910, 285, 21778, Q.COMMON, V.TBC, 285, 295, 305, 315)
@@ -293,7 +293,7 @@ function addon:InitJewelcrafting()
 	-- Living Emerald Pendant -- 26911
 	AddRecipe(26911, 290, 21791, Q.COMMON, V.TBC, 290, 300, 310, 320)
 	self:AddRecipeFlags(26911, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeTrainer(26911, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(26911, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Figurine - Black Diamond Crab -- 26912
 	AddRecipe(26912, 300, 21784, Q.UNCOMMON, V.TBC, 300, 310, 320, 330)
@@ -302,7 +302,7 @@ function addon:InitJewelcrafting()

 	-- Figurine - Dark Iron Scorpid -- 26914
 	AddRecipe(26914, 300, 21789, Q.UNCOMMON, V.TBC, 300, 310, 320, 330)
-	self:AddRecipeFlags(26914, F.ALLIANCE, F.HORDE, F.INSTANCE,F.MOB_DROP, F.IBOP, F.RBOP, F.DPS, F.TRINKET)
+	self:AddRecipeFlags(26914, F.ALLIANCE, F.HORDE, F.INSTANCE, F.MOB_DROP, F.IBOP, F.RBOP, F.DPS, F.TRINKET)
 	self:AddRecipeMobDrop(26914, 8983)

 	-- Necklace of the Diamond Tower -- 26915
@@ -313,7 +313,7 @@ function addon:InitJewelcrafting()
 	-- Band of Natural Fire -- 26916
 	AddRecipe(26916, 310, 21779, Q.COMMON, V.TBC, 310, 320, 330, 340)
 	self:AddRecipeFlags(26916, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(26916, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(26916, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Woven Copper Ring -- 26925
 	AddRecipe(26925, 1, 21931, Q.UNCOMMON, V.TBC, 1, 30, 45, 60)
@@ -323,27 +323,27 @@ function addon:InitJewelcrafting()
 	-- Heavy Copper Ring -- 26926
 	AddRecipe(26926, 5, 21932, Q.COMMON, V.TBC, 5, 35, 50, 65)
 	self:AddRecipeFlags(26926, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(26926, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(26926, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Thick Bronze Necklace -- 26927
 	AddRecipe(26927, 50, 21933, Q.COMMON, V.TBC, 50, 80, 95, 110)
 	self:AddRecipeFlags(26927, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.NECK)
-	self:AddRecipeTrainer(26927, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(26927, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Ornate Tigerseye Necklace -- 26928
 	AddRecipe(26928, 30, 21934, Q.COMMON, V.TBC, 30, 60, 75, 90)
 	self:AddRecipeFlags(26928, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeTrainer(26928, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(26928, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Teardrop Blood Garnet -- 28903
 	AddRecipe(28903, 300, 23094, Q.COMMON, V.TBC, 300, 300, 320, 340)
 	self:AddRecipeFlags(28903, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(28903, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28903, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Bold Blood Garnet -- 28905
 	AddRecipe(28905, 305, 23095, Q.COMMON, V.TBC, 305, 305, 325, 345)
 	self:AddRecipeFlags(28905, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(28905, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28905, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Runed Blood Garnet -- 28906
 	AddRecipe(28906, 315, 23096, Q.UNCOMMON, V.TBC, 315, 315, 335, 355)
@@ -358,7 +358,7 @@ function addon:InitJewelcrafting()
 	-- Inscribed Flame Spessarite -- 28910
 	AddRecipe(28910, 300, 23098, Q.COMMON, V.TBC, 300, 300, 320, 340)
 	self:AddRecipeFlags(28910, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(28910, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28910, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Luminous Flame Spessarite -- 28912
 	AddRecipe(28912, 305, 23099, Q.UNCOMMON, V.TBC, 305, 305, 325, 345)
@@ -368,7 +368,7 @@ function addon:InitJewelcrafting()
 	-- Glinting Flame Spessarite -- 28914
 	AddRecipe(28914, 315, 23100, Q.COMMON, V.TBC, 315, 315, 335, 355)
 	self:AddRecipeFlags(28914, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(28914, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28914, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Potent Flame Spessarite -- 28915
 	AddRecipe(28915, 325, 23101, Q.UNCOMMON, V.TBC, 325, 325, 340, 355)
@@ -378,12 +378,12 @@ function addon:InitJewelcrafting()
 	-- Radiant Deep Peridot -- 28916
 	AddRecipe(28916, 300, 23103, Q.COMMON, V.TBC, 300, 300, 320, 340)
 	self:AddRecipeFlags(28916, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeTrainer(28916, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28916, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Jagged Deep Peridot -- 28917
 	AddRecipe(28917, 305, 23104, Q.COMMON, V.TBC, 305, 305, 325, 345)
 	self:AddRecipeFlags(28917, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(28917, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28917, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Enduring Deep Peridot -- 28918
 	AddRecipe(28918, 315, 23105, Q.UNCOMMON, V.TBC, 315, 315, 335, 355)
@@ -399,7 +399,7 @@ function addon:InitJewelcrafting()
 	-- Glowing Shadow Draenite -- 28925
 	AddRecipe(28925, 300, 23108, Q.COMMON, V.TBC, 300, 300, 320, 340)
 	self:AddRecipeFlags(28925, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(28925, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28925, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Royal Shadow Draenite -- 28927
 	AddRecipe(28927, 305, 23109, Q.UNCOMMON, V.TBC, 305, 305, 325, 345)
@@ -414,12 +414,12 @@ function addon:InitJewelcrafting()
 	-- Sovereign Shadow Draenite -- 28936
 	AddRecipe(28936, 325, 23111, Q.UNCOMMON, V.TBC, 325, 325, 340, 355)
 	self:AddRecipeFlags(28936, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(28936, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28936, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Brilliant Golden Draenite -- 28938
 	AddRecipe(28938, 300, 23113, Q.COMMON, V.TBC, 300, 300, 320, 340)
 	self:AddRecipeFlags(28938, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(28938, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28938, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Gleaming Golden Draenite -- 28944
 	AddRecipe(28944, 305, 23114, Q.UNCOMMON, V.TBC, 305, 305, 325, 345)
@@ -434,22 +434,22 @@ function addon:InitJewelcrafting()
 	-- Rigid Golden Draenite -- 28948
 	AddRecipe(28948, 325, 23116, Q.UNCOMMON, V.TBC, 325, 325, 340, 355)
 	self:AddRecipeFlags(28948, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(28948, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28948, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Solid Azure Moonstone -- 28950
 	AddRecipe(28950, 300, 23118, Q.COMMON, V.TBC, 300, 300, 320, 340)
 	self:AddRecipeFlags(28950, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(28950, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28950, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Sparkling Azure Moonstone -- 28953
 	AddRecipe(28953, 305, 23119, Q.UNCOMMON, V.TBC, 305, 305, 325, 345)
 	self:AddRecipeFlags(28953, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(28953, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(28953, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Stormy Azure Moonstone -- 28955
 	AddRecipe(28955, 315, 23120, Q.UNCOMMON, V.TBC, 315, 315, 335, 355)
 	self:AddRecipeFlags(28955, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CASTER)
-	self:AddRecipeAcquire(28955, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(28955, 2)

 	-- Lustrous Azure Moonstone -- 28957
 	AddRecipe(28957, 325, 23121, Q.UNCOMMON, V.TBC, 325, 325, 340, 355)
@@ -459,27 +459,27 @@ function addon:InitJewelcrafting()
 	-- Fel Iron Blood Ring -- 31048
 	AddRecipe(31048, 310, 24074, Q.COMMON, V.TBC, 310, 320, 330, 340)
 	self:AddRecipeFlags(31048, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(31048, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(31048, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Golden Draenite Ring -- 31049
 	AddRecipe(31049, 310, 24075, Q.COMMON, V.TBC, 310, 320, 335, 350)
 	self:AddRecipeFlags(31049, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(31049, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(31049, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Azure Moonstone Ring -- 31050
 	AddRecipe(31050, 320, 24076, Q.COMMON, V.TBC, 320, 330, 340, 350)
 	self:AddRecipeFlags(31050, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(31050, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(31050, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Thick Adamantite Necklace -- 31051
 	AddRecipe(31051, 335, 24077, Q.COMMON, V.TBC, 335, 345, 355, 365)
 	self:AddRecipeFlags(31051, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.NECK)
-	self:AddRecipeTrainer(31051, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(31051, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Heavy Adamantite Ring -- 31052
 	AddRecipe(31052, 335, 24078, Q.COMMON, V.TBC, 335, 345, 355, 365)
 	self:AddRecipeFlags(31052, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(31052, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(31052, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Khorium Band of Shadows -- 31053
 	AddRecipe(31053, 350, 24079, Q.RARE, V.TBC, 350, 360, 370, 380)
@@ -509,17 +509,17 @@ function addon:InitJewelcrafting()
 	-- Heavy Felsteel Ring -- 31058
 	AddRecipe(31058, 345, 24087, Q.RARE, V.TBC, 345, 355, 365, 375)
 	self:AddRecipeFlags(31058, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.RING)
-	self:AddRecipeAcquire(31058, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31058, 3)

 	-- Delicate Eternium Ring -- 31060
 	AddRecipe(31060, 355, 24088, Q.RARE, V.TBC, 355, 365, 375, 385)
 	self:AddRecipeFlags(31060, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.TANK, F.RING)
-	self:AddRecipeAcquire(31060, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31060, 3)

 	-- Blazing Eternium Band -- 31061
 	AddRecipe(31061, 365, 24089, Q.RARE, V.TBC, 365, 375, 377, 380)
 	self:AddRecipeFlags(31061, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeAcquire(31061, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31061, 3)

 	-- Pendant of Frozen Flame -- 31062
 	AddRecipe(31062, 360, 24092, Q.RARE, V.TBC, 360, 370, 375, 380)
@@ -549,32 +549,32 @@ function addon:InitJewelcrafting()
 	-- Thick Felsteel Necklace -- 31067
 	AddRecipe(31067, 355, 24106, Q.RARE, V.TBC, 355, 365, 375, 385)
 	self:AddRecipeFlags(31067, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.NECK)
-	self:AddRecipeAcquire(31067, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31067, 3)

 	-- Living Ruby Pendant -- 31068
 	AddRecipe(31068, 355, 24110, Q.RARE, V.TBC, 355, 365, 375, 385)
 	self:AddRecipeFlags(31068, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeAcquire(31068, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31068, 3)

 	-- Braided Eternium Chain -- 31070
 	AddRecipe(31070, 360, 24114, Q.RARE, V.TBC, 360, 370, 377, 385)
 	self:AddRecipeFlags(31070, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.NECK)
-	self:AddRecipeAcquire(31070, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31070, 3)

 	-- Eye of the Night -- 31071
 	AddRecipe(31071, 360, 24116, Q.RARE, V.TBC, 360, 370, 375, 380)
 	self:AddRecipeFlags(31071, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeAcquire(31071, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31071, 3)

 	-- Embrace of the Dawn -- 31072
 	AddRecipe(31072, 365, 24117, Q.RARE, V.TBC, 365, 375, 380, 385)
 	self:AddRecipeFlags(31072, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeAcquire(31072, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31072, 3)

 	-- Chain of the Twilight Owl -- 31076
 	AddRecipe(31076, 365, 24121, Q.RARE, V.TBC, 365, 375, 380, 385)
 	self:AddRecipeFlags(31076, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeAcquire(31076, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31076, 3)

 	-- Coronet of Verdant Flame -- 31077
 	AddRecipe(31077, 370, 24122, Q.EPIC, V.TBC, 370, 375, 380, 385)
@@ -615,81 +615,81 @@ function addon:InitJewelcrafting()
 	-- Bold Living Ruby -- 31084
 	AddRecipe(31084, 350, 24027, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31084, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(31084, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31084, 3)

 	-- Delicate Living Ruby -- 31085
 	AddRecipe(31085, 350, 24028, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31085, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(31085, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31085, 3)

 	-- Teardrop Living Ruby -- 31087
 	AddRecipe(31087, 350, 24029, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31087, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(31087, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31087, 3)

 	-- Runed Living Ruby -- 31088
 	AddRecipe(31088, 350, 24030, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31088, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.MOB_DROP, F.IBOE, F.RBOE, F.RBOP, F.HEALER, F.CASTER)
 	self:AddRecipeMobDrop(31088, 24664)
-	self:AddRecipeAcquire(31088, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31088, 3)

 	-- Bright Living Ruby -- 31089
 	AddRecipe(31089, 350, 24031, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31089, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.MOB_DROP, F.IBOE, F.RBOE, F.RBOP, F.DPS)
 	self:AddRecipeMobDrop(31089, 24664)
-	self:AddRecipeAcquire(31089, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31089, 3)

 	-- Subtle Living Ruby -- 31090
 	AddRecipe(31090, 350, 24032, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31090, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK)
-	self:AddRecipeAcquire(31090, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31090, 3)

 	-- Flashing Living Ruby -- 31091
 	AddRecipe(31091, 350, 24036, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31091, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK)
-	self:AddRecipeAcquire(31091, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31091, 3)

 	-- Solid Star of Elune -- 31092
 	AddRecipe(31092, 350, 24033, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31092, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.MOB_DROP, F.IBOE, F.RBOE, F.RBOP)
 	self:AddRecipeMobDrop(31092, 24664)
-	self:AddRecipeAcquire(31092, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31092, 3)

 	-- Lustrous Star of Elune -- 31094
 	AddRecipe(31094, 350, 24037, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31094, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(31094, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31094, 3)

 	-- Stormy Star of Elune -- 31095
 	AddRecipe(31095, 350, 24039, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31095, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CASTER)
-	self:AddRecipeAcquire(31095, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31095, 3)

 	-- Brilliant Dawnstone -- 31096
 	AddRecipe(31096, 350, 24047, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31096, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(31096, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31096, 3)

 	-- Smooth Dawnstone -- 31097
 	AddRecipe(31097, 350, 24048, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31097, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(31097, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31097, 3)

 	-- Rigid Dawnstone -- 31098
 	AddRecipe(31098, 350, 24051, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31098, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.MOB_DROP, F.IBOE, F.RBOE, F.RBOP)
 	self:AddRecipeMobDrop(31098, 24664)
-	self:AddRecipeAcquire(31098, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31098, 3)

 	-- Gleaming Dawnstone -- 31099
 	AddRecipe(31099, 350, 24050, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31099, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(31099, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31099, 3)

 	-- Thick Dawnstone -- 31100
 	AddRecipe(31100, 350, 24052, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31100, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK)
-	self:AddRecipeAcquire(31100, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31100, 3)

 	-- Mystic Dawnstone -- 31101
 	AddRecipe(31101, 350, 24053, Q.RARE, V.TBC, 350, 350, 365, 380)
@@ -699,77 +699,77 @@ function addon:InitJewelcrafting()
 	-- Sovereign Nightseye -- 31102
 	AddRecipe(31102, 350, 24054, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31102, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(31102, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31102, 3)

 	-- Shifting Nightseye -- 31103
 	AddRecipe(31103, 350, 24055, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31103, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(31103, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31103, 3)

 	-- Glowing Nightseye -- 31104
 	AddRecipe(31104, 350, 24056, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31104, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(31104, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31104, 3)

 	-- Royal Nightseye -- 31105
 	AddRecipe(31105, 350, 24057, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31105, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(31105, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31105, 3)

 	-- Inscribed Noble Topaz -- 31106
 	AddRecipe(31106, 350, 24058, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31106, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(31106, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31106, 3)

 	-- Potent Noble Topaz -- 31107
 	AddRecipe(31107, 350, 24059, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31107, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(31107, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31107, 3)

 	-- Luminous Noble Topaz -- 31108
 	AddRecipe(31108, 350, 24060, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31108, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(31108, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31108, 3)

 	-- Glinting Noble Topaz -- 31109
 	AddRecipe(31109, 350, 24061, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31109, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(31109, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31109, 3)

 	-- Enduring Talasite -- 31110
 	AddRecipe(31110, 350, 24062, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31110, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK)
-	self:AddRecipeAcquire(31110, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31110, 3)

 	-- Radiant Talasite -- 31111
 	AddRecipe(31111, 350, 24066, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31111, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CASTER)
-	self:AddRecipeAcquire(31111, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31111, 3)

 	-- Dazzling Talasite -- 31112
 	AddRecipe(31112, 350, 24065, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31112, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(31112, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31112, 3)

 	-- Jagged Talasite -- 31113
 	AddRecipe(31113, 350, 24067, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31113, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(31113, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31113, 3)

 	-- Sparkling Star of Elune -- 31149
 	AddRecipe(31149, 350, 24035, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(31149, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(31149, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31149, 3)

 	-- Malachite Pendant -- 32178
 	AddRecipe(32178, 20, 25438, Q.COMMON, V.TBC, 20, 50, 65, 80)
 	self:AddRecipeFlags(32178, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.NECK)
-	self:AddRecipeTrainer(32178, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(32178, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Tigerseye Band -- 32179
 	AddRecipe(32179, 20, 25439, Q.COMMON, V.TBC, 20, 50, 65, 80)
 	self:AddRecipeFlags(32179, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(32179, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(32179, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Rough Stone Statue -- 32259
 	AddRecipe(32259, 1, 25498, Q.COMMON, V.TBC, 1, 30, 40, 50)
@@ -779,22 +779,22 @@ function addon:InitJewelcrafting()
 	-- Coarse Stone Statue -- 32801
 	AddRecipe(32801, 50, 25880, Q.COMMON, V.TBC, 50, 70, 80, 90)
 	self:AddRecipeFlags(32801, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(32801, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 18774, 28701, 15501)
+	self:AddRecipeTrainer(32801, 15501, 33614, 28701, 18774, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Heavy Stone Statue -- 32807
 	AddRecipe(32807, 110, 25881, Q.COMMON, V.TBC, 110, 120, 130, 140)
 	self:AddRecipeFlags(32807, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(32807, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(32807, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Solid Stone Statue -- 32808
 	AddRecipe(32808, 175, 25882, Q.COMMON, V.TBC, 175, 175, 185, 195)
 	self:AddRecipeFlags(32808, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(32808, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(32808, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Dense Stone Statue -- 32809
 	AddRecipe(32809, 225, 25883, Q.COMMON, V.TBC, 225, 225, 235, 245)
 	self:AddRecipeFlags(32809, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP)
-	self:AddRecipeTrainer(32809, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(32809, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Powerful Earthstorm Diamond -- 32866
 	AddRecipe(32866, 365, 25896, Q.COMMON, V.TBC, 365, 375, 377, 380)
@@ -809,12 +809,12 @@ function addon:InitJewelcrafting()
 	-- Tenacious Earthstorm Diamond -- 32868
 	AddRecipe(32868, 365, 25898, Q.RARE, V.TBC, 365, 375, 377, 380)
 	self:AddRecipeFlags(32868, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK)
-	self:AddRecipeAcquire(32868, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(32868, 3)

 	-- Brutal Earthstorm Diamond -- 32869
 	AddRecipe(32869, 365, 25899, Q.RARE, V.TBC, 365, 375, 377, 380)
 	self:AddRecipeFlags(32869, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(32869, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(32869, 3)

 	-- Insightful Earthstorm Diamond -- 32870
 	AddRecipe(32870, 365, 25901, Q.COMMON, V.TBC, 365, 375, 377, 380)
@@ -824,12 +824,12 @@ function addon:InitJewelcrafting()
 	-- Destructive Skyfire Diamond -- 32871
 	AddRecipe(32871, 365, 25890, Q.RARE, V.TBC, 365, 375, 377, 380)
 	self:AddRecipeFlags(32871, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(32871, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(32871, 3)

 	-- Mystical Skyfire Diamond -- 32872
 	AddRecipe(32872, 365, 25893, Q.RARE, V.TBC, 365, 375, 377, 380)
 	self:AddRecipeFlags(32872, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(32872, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(32872, 3)

 	-- Swift Skyfire Diamond -- 32873
 	AddRecipe(32873, 365, 25894, Q.COMMON, V.TBC, 365, 375, 377, 380)
@@ -844,57 +844,57 @@ function addon:InitJewelcrafting()
 	-- Smooth Golden Draenite -- 34069
 	AddRecipe(34069, 325, 28290, Q.UNCOMMON, V.TBC, 325, 325, 340, 355)
 	self:AddRecipeFlags(34069, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(34069, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(34069, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Bright Blood Garnet -- 34590
 	AddRecipe(34590, 305, 28595, Q.COMMON, V.TBC, 305, 305, 325, 345)
 	self:AddRecipeFlags(34590, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(34590, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(34590, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Golden Ring of Power -- 34955
 	AddRecipe(34955, 180, 29157, Q.COMMON, V.TBC, 180, 190, 200, 210)
 	self:AddRecipeFlags(34955, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(34955, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(34955, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Truesilver Commander's Ring -- 34959
 	AddRecipe(34959, 200, 29158, Q.COMMON, V.TBC, 200, 210, 220, 230)
 	self:AddRecipeFlags(34959, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.RING)
-	self:AddRecipeTrainer(34959, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(34959, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Glowing Thorium Band -- 34960
 	AddRecipe(34960, 280, 29159, Q.COMMON, V.TBC, 280, 290, 300, 310)
 	self:AddRecipeFlags(34960, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(34960, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(34960, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Emerald Lion Ring -- 34961
 	AddRecipe(34961, 290, 29160, Q.COMMON, V.TBC, 290, 300, 310, 320)
 	self:AddRecipeFlags(34961, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(34961, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(34961, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Brilliant Necklace -- 36523
 	AddRecipe(36523, 75, 30419, Q.COMMON, V.TBC, 75, 105, 120, 135)
 	self:AddRecipeFlags(36523, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.NECK)
-	self:AddRecipeTrainer(36523, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(36523, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Heavy Jade Ring -- 36524
 	AddRecipe(36524, 105, 30420, Q.COMMON, V.TBC, 105, 135, 150, 165)
 	self:AddRecipeFlags(36524, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(36524, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(36524, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Red Ring of Destruction -- 36525
 	AddRecipe(36525, 230, 30421, Q.COMMON, V.TBC, 230, 255, 270, 285)
 	self:AddRecipeFlags(36525, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.RING)
-	self:AddRecipeTrainer(36525, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(36525, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Diamond Focus Ring -- 36526
 	AddRecipe(36526, 265, 30422, Q.COMMON, V.TBC, 265, 285, 295, 305)
 	self:AddRecipeFlags(36526, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(36526, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(36526, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Bronze Band of Force -- 37818
 	AddRecipe(37818, 65, 30804, Q.COMMON, V.TBC, 65, 95, 110, 125)
 	self:AddRecipeFlags(37818, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(37818, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(37818, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Ring of Arcane Shielding -- 37855
 	AddRecipe(37855, 360, 30825, Q.RARE, V.TBC, 360, 370, 375, 380)
@@ -904,12 +904,12 @@ function addon:InitJewelcrafting()
 	-- Mercurial Adamantite -- 38068
 	AddRecipe(38068, 325, 31079, Q.COMMON, V.TBC, 325, 325, 335, 345)
 	self:AddRecipeFlags(38068, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(38068, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(38068, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Bronze Torc -- 38175
 	AddRecipe(38175, 80, 31154, Q.COMMON, V.TBC, 80, 110, 125, 140)
 	self:AddRecipeFlags(38175, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.NECK)
-	self:AddRecipeTrainer(38175, 33680, 33614, 26960, 26915, 26982, 33590, 19778, 26997, 18751, 19775, 19539, 19063, 15501, 28701, 18774)
+	self:AddRecipeTrainer(38175, 18774, 33614, 28701, 15501, 26997, 19775, 19778, 26982, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- The Frozen Eye -- 38503
 	AddRecipe(38503, 375, 31398, Q.EPIC, V.TBC, 375, 375, 380, 385)
@@ -929,7 +929,7 @@ function addon:InitJewelcrafting()
 	-- Great Dawnstone -- 39452
 	AddRecipe(39452, 350, 31861, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(39452, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(39452, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(39452, 3)

 	-- Balanced Shadow Draenite -- 39455
 	AddRecipe(39455, 325, 31862, Q.UNCOMMON, V.TBC, 325, 325, 340, 355)
@@ -944,12 +944,12 @@ function addon:InitJewelcrafting()
 	-- Infused Nightseye -- 39462
 	AddRecipe(39462, 350, 31865, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(39462, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(39462, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(39462, 3)

 	-- Balanced Nightseye -- 39463
 	AddRecipe(39463, 350, 31863, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(39463, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(39463, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(39463, 3)

 	-- Veiled Flame Spessarite -- 39466
 	AddRecipe(39466, 325, 31866, Q.UNCOMMON, V.TBC, 325, 325, 340, 355)
@@ -964,12 +964,12 @@ function addon:InitJewelcrafting()
 	-- Veiled Noble Topaz -- 39470
 	AddRecipe(39470, 350, 31867, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(39470, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(39470, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(39470, 3)

 	-- Wicked Noble Topaz -- 39471
 	AddRecipe(39471, 350, 31868, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(39471, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(39471, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(39471, 3)

 	-- Bold Crimson Spinel -- 39705
 	AddRecipe(39705, 375, 32193, Q.COMMON, V.TBC, 375, 375, 380, 385)
@@ -1183,37 +1183,37 @@ function addon:InitJewelcrafting()
 	-- Thundering Skyfire Diamond -- 39963
 	AddRecipe(39963, 365, 32410, Q.RARE, V.TBC, 365, 375, 377, 380)
 	self:AddRecipeFlags(39963, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(39963, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(39963, 3)

 	-- Necklace of the Deep -- 40514
 	AddRecipe(40514, 340, 32508, Q.COMMON, V.TBC, 340, 340, 355, 370)
 	self:AddRecipeFlags(40514, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.NECK)
-	self:AddRecipeTrainer(40514, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(40514, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Brilliant Pearl Band -- 41414
 	AddRecipe(41414, 325, 32772, Q.COMMON, V.TBC, 325, 335, 345, 355)
 	self:AddRecipeFlags(41414, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(41414, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(41414, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- The Black Pearl -- 41415
 	AddRecipe(41415, 330, 32774, Q.COMMON, V.TBC, 330, 340, 350, 360)
 	self:AddRecipeFlags(41415, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.RING)
-	self:AddRecipeTrainer(41415, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(41415, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Crown of the Sea Witch -- 41418
 	AddRecipe(41418, 365, 32776, Q.COMMON, V.TBC, 365, 375, 380, 385)
 	self:AddRecipeFlags(41418, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(41418, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(41418, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Purified Jaggal Pearl -- 41420
 	AddRecipe(41420, 325, 32833, Q.COMMON, V.TBC, 325, 325, 332, 340)
 	self:AddRecipeFlags(41420, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(41420, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(41420, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Purified Shadow Pearl -- 41429
 	AddRecipe(41429, 350, 32836, Q.COMMON, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(41429, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeTrainer(41429, 33614, 33680, 26960, 33590, 26982, 18751, 26915, 19539, 19063, 18774, 28701, 26997)
+	self:AddRecipeTrainer(41429, 33614, 26997, 28701, 18774, 26982, 18751, 26960, 19539, 19063, 26915, 33680, 33590)

 	-- Don Julio's Heart -- 42558
 	AddRecipe(42558, 360, 33133, Q.COMMON, V.TBC, 360, 365, 370, 375)
@@ -1348,31 +1348,31 @@ function addon:InitJewelcrafting()
 	-- Forceful Seaspray Emerald -- 47053
 	AddRecipe(47053, 375, 35759, Q.EPIC, V.TBC, 375, 375, 380, 385)
 	self:AddRecipeFlags(47053, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.SCALE_SANDS, F.SHATTEREDSUN)
-	self:AddRecipeRepVendor(47053, FAC.SHATTEREDSUN, REP.REVERED, 27666, 25950, 25032)
+	self:AddRecipeRepVendor(47053, FAC.SHATTEREDSUN, REP.REVERED, 25032, 25950, 27666)
 	self:AddRecipeRepVendor(47053, FAC.SCALE_OF_SANDS, REP.HONORED, 23437)

 	-- Steady Seaspray Emerald -- 47054
 	AddRecipe(47054, 375, 35758, Q.EPIC, V.TBC, 375, 375, 380, 385)
 	self:AddRecipeFlags(47054, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.SCALE_SANDS, F.SHATTEREDSUN)
 	self:AddRecipeRepVendor(47054, FAC.SCALE_OF_SANDS, REP.HONORED, 23437)
-	self:AddRecipeRepVendor(47054, FAC.SHATTEREDSUN, REP.REVERED, 27666, 25950, 25032)
+	self:AddRecipeRepVendor(47054, FAC.SHATTEREDSUN, REP.REVERED, 25032, 25950, 27666)

 	-- Reckless Pyrestone -- 47055
 	AddRecipe(47055, 375, 35760, Q.EPIC, V.TBC, 375, 375, 380, 385)
 	self:AddRecipeFlags(47055, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.SCALE_SANDS, F.SHATTEREDSUN)
-	self:AddRecipeRepVendor(47055, FAC.SHATTEREDSUN, REP.REVERED, 27666, 25950, 25032)
+	self:AddRecipeRepVendor(47055, FAC.SHATTEREDSUN, REP.REVERED, 25032, 25950, 27666)
 	self:AddRecipeRepVendor(47055, FAC.SCALE_OF_SANDS, REP.HONORED, 23437)

 	-- Quick Lionseye -- 47056
 	AddRecipe(47056, 375, 35761, Q.EPIC, V.TBC, 375, 375, 380, 385)
 	self:AddRecipeFlags(47056, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.SCALE_SANDS, F.SHATTEREDSUN)
-	self:AddRecipeRepVendor(47056, FAC.SHATTEREDSUN, REP.REVERED, 27666, 25950, 25032)
+	self:AddRecipeRepVendor(47056, FAC.SHATTEREDSUN, REP.REVERED, 25032, 25950, 27666)
 	self:AddRecipeRepVendor(47056, FAC.SCALE_OF_SANDS, REP.HONORED, 23437)

 	-- Brilliant Glass -- 47280
 	AddRecipe(47280, 350, 35945, Q.RARE, V.TBC, 350, 350, 365, 380)
 	self:AddRecipeFlags(47280, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(47280, 33614, 33680, 33590, 26915, 26997, 18751, 26960, 19539, 19063, 18774, 28701, 26982)
+	self:AddRecipeTrainer(47280, 33614, 26982, 28701, 18774, 26997, 18751, 26915, 19539, 19063, 33590, 33680, 26960)

 	-- Purified Shadowsong Amethyst -- 48789
 	AddRecipe(48789, 375, 37503, Q.COMMON, V.TBC, 375, 375, 380, 385)
@@ -1827,7 +1827,7 @@ function addon:InitJewelcrafting()
 	-- Sovereign Twilight Opal -- 53962
 	AddRecipe(53962, 390, 40022, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(53962, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(53962, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(53962, 3)

 	-- Shifting Twilight Opal -- 53963
 	AddRecipe(53963, 390, 40023, Q.RARE, V.WOTLK, 390, 410, 425, 440)
@@ -1837,7 +1837,7 @@ function addon:InitJewelcrafting()
 	-- Tenuous Twilight Opal -- 53964
 	AddRecipe(53964, 390, 40024, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(53964, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(53964, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(53964, 3)

 	-- Glowing Twilight Opal -- 53965
 	AddRecipe(53965, 390, 40025, Q.RARE, V.WOTLK, 390, 410, 425, 440)
@@ -1847,7 +1847,7 @@ function addon:InitJewelcrafting()
 	-- Purified Twilight Opal -- 53966
 	AddRecipe(53966, 390, 40026, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(53966, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(53966, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(53966, 3)

 	-- Royal Twilight Opal -- 53967
 	AddRecipe(53967, 390, 40027, Q.RARE, V.WOTLK, 390, 410, 425, 440)
@@ -1877,7 +1877,7 @@ function addon:InitJewelcrafting()
 	-- Defender's Twilight Opal -- 53972
 	AddRecipe(53972, 390, 40032, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(53972, F.ALLIANCE, F.HORDE, F.MOB_DROP, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeMobDrop(53972, 30208, 30222, 29376, 29370)
+	self:AddRecipeMobDrop(53972, 30208, 29370, 30222, 29376)

 	-- Puissant Twilight Opal -- 53973
 	AddRecipe(53973, 390, 40033, Q.RARE, V.WOTLK, 390, 410, 425, 440)
@@ -1892,17 +1892,17 @@ function addon:InitJewelcrafting()
 	-- Inscribed Monarch Topaz -- 53975
 	AddRecipe(53975, 390, 40037, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(53975, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(53975, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(53975, 3)

 	-- Etched Monarch Topaz -- 53976
 	AddRecipe(53976, 390, 40038, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(53976, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(53976, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(53976, 3)

 	-- Champion's Monarch Topaz -- 53977
 	AddRecipe(53977, 390, 40039, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(53977, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.TANK)
-	self:AddRecipeAcquire(53977, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(53977, 3)

 	-- Resplendent Monarch Topaz -- 53978
 	AddRecipe(53978, 390, 40040, Q.RARE, V.WOTLK, 390, 410, 425, 440)
@@ -1977,7 +1977,7 @@ function addon:InitJewelcrafting()
 	-- Stalwart Monarch Topaz -- 53992
 	AddRecipe(53992, 390, 40056, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(53992, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK)
-	self:AddRecipeAcquire(53992, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(53992, 3)

 	-- Glimmering Monarch Topaz -- 53993
 	AddRecipe(53993, 390, 40057, Q.RARE, V.WOTLK, 390, 410, 425, 440)
@@ -2027,12 +2027,12 @@ function addon:InitJewelcrafting()
 	-- Misty Forest Emerald -- 54003
 	AddRecipe(54003, 390, 40095, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(54003, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(54003, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(54003, 3)

 	-- Shining Forest Emerald -- 54004
 	AddRecipe(54004, 390, 40099, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(54004, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(54004, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(54004, 3)

 	-- Turbid Forest Emerald -- 54005
 	AddRecipe(54005, 390, 40102, Q.RARE, V.WOTLK, 390, 410, 425, 440)
@@ -2097,7 +2097,7 @@ function addon:InitJewelcrafting()
 	-- Resolute Monarch Topaz -- 54023
 	AddRecipe(54023, 390, 40059, Q.RARE, V.WOTLK, 390, 410, 425, 440)
 	self:AddRecipeFlags(54023, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.TANK)
-	self:AddRecipeAcquire(54023, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(54023, 3)

 	-- Effulgent Skyflare Diamond -- 55384
 	AddRecipe(55384, 420, 41377, Q.RARE, V.WOTLK, 420, 440, 450, 460)
@@ -2127,7 +2127,7 @@ function addon:InitJewelcrafting()
 	-- Destructive Skyflare Diamond -- 55390
 	AddRecipe(55390, 420, 41307, Q.RARE, V.WOTLK, 420, 440, 450, 460)
 	self:AddRecipeFlags(55390, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(55390, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(55390, 3)

 	-- Ember Skyflare Diamond -- 55392
 	AddRecipe(55392, 420, 41333, Q.RARE, V.WOTLK, 420, 440, 450, 460)
@@ -2147,7 +2147,7 @@ function addon:InitJewelcrafting()
 	-- Thundering Skyflare Diamond -- 55395
 	AddRecipe(55395, 420, 41400, Q.RARE, V.WOTLK, 420, 440, 450, 460)
 	self:AddRecipeFlags(55395, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(55395, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(55395, 3)

 	-- Insightful Earthsiege Diamond -- 55396
 	AddRecipe(55396, 420, 41401, Q.RARE, V.WOTLK, 420, 440, 450, 460)
@@ -2197,7 +2197,7 @@ function addon:InitJewelcrafting()
 	-- Beaming Earthsiege Diamond -- 55405
 	AddRecipe(55405, 420, 41389, Q.RARE, V.WOTLK, 420, 440, 450, 460)
 	self:AddRecipeFlags(55405, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(55405, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(55405, 3)

 	-- Revitalizing Skyflare Diamond -- 55407
 	AddRecipe(55407, 420, 41376, Q.RARE, V.WOTLK, 420, 440, 450, 460)
@@ -2472,12 +2472,12 @@ function addon:InitJewelcrafting()
 	-- Prismatic Black Diamond -- 62941
 	AddRecipe(62941, 300, 45054, Q.COMMON, V.WOTLK, 300, 310, 315, 320)
 	self:AddRecipeFlags(62941, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(62941, 33614, 33680, 18774, 26915, 26997, 18751, 26960, 19539, 19063, 28701, 33590, 26982)
+	self:AddRecipeTrainer(62941, 33614, 26982, 33590, 28701, 26997, 18751, 26915, 18774, 19063, 19539, 33680, 26960)

 	-- Amulet of Truesight -- 63743
 	AddRecipe(63743, 200, 45627, Q.COMMON, V.WOTLK, 200, 210, 220, 230)
 	self:AddRecipeFlags(63743, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.NECK)
-	self:AddRecipeTrainer(63743, 33680, 33614, 18774, 19539, 33590, 19775, 19778, 26997, 18751, 26960, 15501, 19063, 26915, 28701, 26982)
+	self:AddRecipeTrainer(63743, 26982, 33614, 28701, 26915, 26960, 15501, 19778, 26997, 18751, 19775, 18774, 19063, 19539, 33680, 33590)

 	-- Emerald Choker -- 64725
 	AddRecipe(64725, 420, 45812, Q.COMMON, V.WOTLK, 420, 440, 450, 460)
@@ -2502,367 +2502,367 @@ function addon:InitJewelcrafting()
 	-- Enduring Eye of Zul -- 66338
 	AddRecipe(66338, 450, 40167, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66338, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeVendor(66338, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66338, 33637, 33680, 28701, 19065)

 	-- Steady Eye of Zul -- 66428
 	AddRecipe(66428, 450, 40168, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66428, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66428, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66428, 33637, 33680, 28701, 19065)

 	-- Vivid Eye of Zul -- 66429
 	AddRecipe(66429, 450, 40166, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66429, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66429, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66429, 33637, 33680, 28701, 19065)

 	-- Dazzling Eye of Zul -- 66430
 	AddRecipe(66430, 450, 40175, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66430, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66430, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66430, 33637, 33680, 28701, 19065)

 	-- Jagged Eye of Zul -- 66431
 	AddRecipe(66431, 450, 40165, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66431, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66431, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66431, 33637, 33680, 28701, 19065)

 	-- Timeless Eye of Zul -- 66432
 	AddRecipe(66432, 450, 40164, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66432, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66432, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66432, 33637, 33680, 28701, 19065)

 	-- Seer's Eye of Zul -- 66433
 	AddRecipe(66433, 450, 40170, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66433, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66433, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66433, 33637, 33680, 28701, 19065)

 	-- Forceful Eye of Zul -- 66434
 	AddRecipe(66434, 450, 40169, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66434, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66434, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66434, 33637, 33680, 28701, 19065)

 	-- Misty Eye of Zul -- 66435
 	AddRecipe(66435, 450, 40171, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66435, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66435, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66435, 33637, 33680, 28701, 19065)

 	-- Sundered Eye of Zul -- 66436
 	AddRecipe(66436, 450, 40176, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66436, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66436, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66436, 33637, 33680, 28701, 19065)

 	-- Shining Eye of Zul -- 66437
 	AddRecipe(66437, 450, 40172, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66437, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66437, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66437, 33637, 33680, 28701, 19065)

 	-- Tense Eye of Zul -- 66438
 	AddRecipe(66438, 450, 40181, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66438, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeVendor(66438, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66438, 33637, 33680, 28701, 19065)

 	-- Lambent Eye of Zul -- 66439
 	AddRecipe(66439, 450, 40177, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66439, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66439, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66439, 33637, 33680, 28701, 19065)

 	-- Intricate Eye of Zul -- 66440
 	AddRecipe(66440, 450, 40174, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66440, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66440, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66440, 33637, 33680, 28701, 19065)

 	-- Radiant Eye of Zul -- 66441
 	AddRecipe(66441, 450, 40180, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66441, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeVendor(66441, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66441, 33637, 33680, 28701, 19065)

 	-- Energized Eye of Zul -- 66442
 	AddRecipe(66442, 450, 40179, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66442, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66442, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66442, 33637, 33680, 28701, 19065)

 	-- Shattered Eye of Zul -- 66443
 	AddRecipe(66443, 450, 40182, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66443, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeVendor(66443, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66443, 33637, 33680, 28701, 19065)

 	-- Opaque Eye of Zul -- 66444
 	AddRecipe(66444, 450, 40178, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66444, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66444, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66444, 33637, 33680, 28701, 19065)

 	-- Turbid Eye of Zul -- 66445
 	AddRecipe(66445, 450, 40173, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66445, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66445, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66445, 33637, 33680, 28701, 19065)

 	-- Runed Cardinal Ruby -- 66446
 	AddRecipe(66446, 450, 40113, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66446, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66446, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66446, 33637, 33680, 28701, 19065)

 	-- Bold Cardinal Ruby -- 66447
 	AddRecipe(66447, 450, 40111, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66447, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66447, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66447, 33637, 33680, 28701, 19065)

 	-- Delicate Cardinal Ruby -- 66448
 	AddRecipe(66448, 450, 40112, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66448, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66448, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66448, 33637, 33680, 28701, 19065)

 	-- Bright Cardinal Ruby -- 66449
 	AddRecipe(66449, 450, 40114, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66449, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66449, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66449, 33637, 33680, 28701, 19065)

 	-- Precise Cardinal Ruby -- 66450
 	AddRecipe(66450, 450, 40118, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66450, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeVendor(66450, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66450, 33637, 33680, 28701, 19065)

 	-- Fractured Cardinal Ruby -- 66451
 	AddRecipe(66451, 450, 40117, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66451, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66451, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66451, 33637, 33680, 28701, 19065)

 	-- Subtle Cardinal Ruby -- 66452
 	AddRecipe(66452, 450, 40115, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66452, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeVendor(66452, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66452, 33637, 33680, 28701, 19065)

 	-- Flashing Cardinal Ruby -- 66453
 	AddRecipe(66453, 450, 40116, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66453, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeVendor(66453, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66453, 33637, 33680, 28701, 19065)

 	-- Solid Majestic Zircon -- 66497
 	AddRecipe(66497, 450, 40119, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66497, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66497, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66497, 33637, 33680, 28701, 19065)

 	-- Sparkling Majestic Zircon -- 66498
 	AddRecipe(66498, 450, 40120, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66498, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66498, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66498, 33637, 33680, 28701, 19065)

 	-- Stormy Majestic Zircon -- 66499
 	AddRecipe(66499, 450, 40122, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66499, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.CASTER)
-	self:AddRecipeVendor(66499, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66499, 33637, 33680, 28701, 19065)

 	-- Lustrous Majestic Zircon -- 66500
 	AddRecipe(66500, 450, 40121, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66500, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66500, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66500, 33637, 33680, 28701, 19065)

 	-- Rigid King's Amber -- 66501
 	AddRecipe(66501, 450, 40125, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66501, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66501, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66501, 33637, 33680, 28701, 19065)

 	-- Smooth King's Amber -- 66502
 	AddRecipe(66502, 450, 40124, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66502, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66502, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66502, 33637, 33680, 28701, 19065)

 	-- Brilliant King's Amber -- 66503
 	AddRecipe(66503, 450, 40123, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66503, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66503, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66503, 33637, 33680, 28701, 19065)

 	-- Thick King's Amber -- 66504
 	AddRecipe(66504, 450, 40126, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66504, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeVendor(66504, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66504, 33637, 33680, 28701, 19065)

 	-- Mystic King's Amber -- 66505
 	AddRecipe(66505, 450, 40127, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66505, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66505, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66505, 33637, 33680, 28701, 19065)

 	-- Quick King's Amber -- 66506
 	AddRecipe(66506, 450, 40128, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66506, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(66506, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66506, 33637, 33680, 28701, 19065)

 	-- Balanced Dreadstone -- 66553
 	AddRecipe(66553, 450, 40136, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66553, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66553, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66553, 33637, 33680, 28701, 19065)

 	-- Sovereign Dreadstone -- 66554
 	AddRecipe(66554, 450, 40129, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66554, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66554, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66554, 33637, 33680, 28701, 19065)

 	-- Glowing Dreadstone -- 66555
 	AddRecipe(66555, 450, 40132, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66555, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66555, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66555, 33637, 33680, 28701, 19065)

 	-- Purified Dreadstone -- 66556
 	AddRecipe(66556, 450, 40133, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66556, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66556, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66556, 33637, 33680, 28701, 19065)

 	-- Shifting Dreadstone -- 66557
 	AddRecipe(66557, 450, 40130, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66557, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66557, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66557, 33637, 33680, 28701, 19065)

 	-- Royal Dreadstone -- 66558
 	AddRecipe(66558, 450, 40134, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66558, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66558, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66558, 33637, 33680, 28701, 19065)

 	-- Regal Dreadstone -- 66559
 	AddRecipe(66559, 450, 40138, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66559, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeVendor(66559, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66559, 33637, 33680, 28701, 19065)

 	-- Defender's Dreadstone -- 66560
 	AddRecipe(66560, 450, 40139, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66560, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeVendor(66560, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66560, 33637, 33680, 28701, 19065)

 	-- Guardian's Dreadstone -- 66561
 	AddRecipe(66561, 450, 40141, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66561, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeVendor(66561, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66561, 33637, 33680, 28701, 19065)

 	-- Mysterious Dreadstone -- 66562
 	AddRecipe(66562, 450, 40135, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66562, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66562, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66562, 33637, 33680, 28701, 19065)

 	-- Puissant Dreadstone -- 66563
 	AddRecipe(66563, 450, 40140, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66563, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66563, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66563, 33637, 33680, 28701, 19065)

 	-- Infused Dreadstone -- 66564
 	AddRecipe(66564, 450, 40137, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66564, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66564, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66564, 33637, 33680, 28701, 19065)

 	-- Tenuous Dreadstone -- 66565
 	AddRecipe(66565, 450, 40131, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66565, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66565, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66565, 33637, 33680, 28701, 19065)

 	-- Luminous Ametrine -- 66566
 	AddRecipe(66566, 450, 40151, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66566, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66566, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66566, 33637, 33680, 28701, 19065)

 	-- Inscribed Ametrine -- 66567
 	AddRecipe(66567, 450, 40142, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66567, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66567, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66567, 33637, 33680, 28701, 19065)

 	-- Deadly Ametrine -- 66568
 	AddRecipe(66568, 450, 40147, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66568, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66568, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66568, 33637, 33680, 28701, 19065)

 	-- Potent Ametrine -- 66569
 	AddRecipe(66569, 450, 40152, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66569, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66569, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66569, 33637, 33680, 28701, 19065)

 	-- Veiled Ametrine -- 66570
 	AddRecipe(66570, 450, 40153, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66570, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66570, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66570, 33637, 33680, 28701, 19065)

 	-- Durable Ametrine -- 66571
 	AddRecipe(66571, 450, 40154, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66571, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66571, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66571, 33637, 33680, 28701, 19065)

 	-- Etched Ametrine -- 66572
 	AddRecipe(66572, 450, 40143, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66572, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66572, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66572, 33637, 33680, 28701, 19065)

 	-- Pristine Ametrine -- 66573
 	AddRecipe(66573, 450, 40157, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66573, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66573, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66573, 33637, 33680, 28701, 19065)

 	-- Reckless Ametrine -- 66574
 	AddRecipe(66574, 450, 40155, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66574, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER)
-	self:AddRecipeVendor(66574, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66574, 33637, 33680, 28701, 19065)

 	-- Glinting Ametrine -- 66575
 	AddRecipe(66575, 450, 40148, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66575, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66575, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66575, 33637, 33680, 28701, 19065)

 	-- Accurate Ametrine -- 66576
 	AddRecipe(66576, 450, 40162, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66576, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeVendor(66576, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66576, 33637, 33680, 28701, 19065)

 	-- Wicked Ametrine -- 66577
 	AddRecipe(66577, 450, 40156, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66577, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66577, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66577, 33637, 33680, 28701, 19065)

 	-- Glimmering Ametrine -- 66578
 	AddRecipe(66578, 450, 40161, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66578, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeVendor(66578, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66578, 33637, 33680, 28701, 19065)

 	-- Champion's Ametrine -- 66579
 	AddRecipe(66579, 450, 40144, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66579, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66579, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66579, 33637, 33680, 28701, 19065)

 	-- Empowered Ametrine -- 66580
 	AddRecipe(66580, 450, 40158, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66580, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66580, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66580, 33637, 33680, 28701, 19065)

 	-- Stalwart Ametrine -- 66581
 	AddRecipe(66581, 450, 40160, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66581, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.TANK)
-	self:AddRecipeVendor(66581, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66581, 33637, 33680, 28701, 19065)

 	-- Resplendent Ametrine -- 66582
 	AddRecipe(66582, 450, 40145, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66582, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66582, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66582, 33637, 33680, 28701, 19065)

 	-- Fierce Ametrine -- 66583
 	AddRecipe(66583, 450, 40146, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66583, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66583, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66583, 33637, 33680, 28701, 19065)

 	-- Deft Ametrine -- 66584
 	AddRecipe(66584, 450, 40150, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66584, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66584, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66584, 33637, 33680, 28701, 19065)

 	-- Lucent Ametrine -- 66585
 	AddRecipe(66585, 450, 40149, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66585, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66585, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66585, 33637, 33680, 28701, 19065)

 	-- Resolute Ametrine -- 66586
 	AddRecipe(66586, 450, 40163, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66586, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS, F.TANK)
-	self:AddRecipeVendor(66586, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66586, 33637, 33680, 28701, 19065)

 	-- Stark Ametrine -- 66587
 	AddRecipe(66587, 450, 40159, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(66587, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeVendor(66587, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(66587, 33637, 33680, 28701, 19065)

 	-- Nightmare Tear -- 68253
 	AddRecipe(68253, 450, 49110, Q.RARE, V.WOTLK, 450, 450, 452, 465)
 	self:AddRecipeFlags(68253, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
-	self:AddRecipeVendor(68253, 33637, 28701, 19065, 33680)
+	self:AddRecipeVendor(68253, 33637, 33680, 28701, 19065)

 	return num_recipes
 end
diff --git a/Database/Leatherworking.lua b/Database/Leatherworking.lua
index 719597d..daf061f 100644
--- a/Database/Leatherworking.lua
+++ b/Database/Leatherworking.lua
@@ -63,67 +63,67 @@ function addon:InitLeatherworking()
 	-- Handstitched Leather Pants -- 2153
 	AddRecipe(2153, 15, 2303, Q.COMMON, V.ORIG, 15, 45, 60, 75)
 	self:AddRecipeFlags(2153, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(2153, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 33635, 3605, 11098, 16728, 3549, 4588, 3365, 18771, 5127, 33612, 17442, 5564, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(2153, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 3365, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 5564, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Fine Leather Boots -- 2158
 	AddRecipe(2158, 90, 2307, Q.UNCOMMON, V.ORIG, 90, 120, 135, 150)
 	self:AddRecipeFlags(2158, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(2158, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(2158, 2)

 	-- Fine Leather Cloak -- 2159
 	AddRecipe(2159, 85, 2308, Q.COMMON, V.ORIG, 85, 105, 120, 135)
 	self:AddRecipeFlags(2159, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOAK)
-	self:AddRecipeTrainer(2159, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(2159, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Embossed Leather Vest -- 2160
 	AddRecipe(2160, 40, 2300, Q.COMMON, V.ORIG, 40, 70, 85, 100)
 	self:AddRecipeFlags(2160, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(2160, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 33635, 3605, 11098, 16728, 3549, 4588, 3365, 18771, 5127, 33612, 17442, 5564, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(2160, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 3365, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 5564, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Embossed Leather Boots -- 2161
 	AddRecipe(2161, 55, 2309, Q.COMMON, V.ORIG, 55, 85, 100, 115)
 	self:AddRecipeFlags(2161, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(2161, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 33635, 3605, 11098, 16728, 3549, 4588, 5564, 18771, 5127, 33612, 17442, 3365, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(2161, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 5564, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 3365, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Embossed Leather Cloak -- 2162
 	AddRecipe(2162, 60, 2310, Q.COMMON, V.ORIG, 60, 90, 105, 120)
 	self:AddRecipeFlags(2162, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.CLOAK)
-	self:AddRecipeTrainer(2162, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 33635, 3605, 11098, 16728, 3549, 4588, 5564, 18771, 5127, 33612, 17442, 3365, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(2162, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 5564, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 3365, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- White Leather Jerkin -- 2163
 	AddRecipe(2163, 60, 2311, Q.UNCOMMON, V.ORIG, 60, 90, 105, 120)
 	self:AddRecipeFlags(2163, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(2163, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(2163, 2)

 	-- Fine Leather Gloves -- 2164
 	AddRecipe(2164, 75, 2312, Q.UNCOMMON, V.ORIG, 75, 105, 120, 135)
 	self:AddRecipeFlags(2164, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(2164, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(2164, 2)

 	-- Medium Armor Kit -- 2165
 	AddRecipe(2165, 100, 2313, Q.COMMON, V.ORIG, 100, 115, 122, 130)
 	self:AddRecipeFlags(2165, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2165, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 16728, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 18771, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(2165, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 5564, 4212, 8153, 4588, 18771, 16728, 33612, 17442, 3549, 3007, 5127, 16278, 21087, 33681, 33635)

 	-- Toughened Leather Armor -- 2166
 	AddRecipe(2166, 120, 2314, Q.COMMON, V.ORIG, 120, 145, 157, 170)
 	self:AddRecipeFlags(2166, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(2166, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(2166, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Dark Leather Boots -- 2167
 	AddRecipe(2167, 100, 2315, Q.COMMON, V.ORIG, 100, 125, 137, 150)
 	self:AddRecipeFlags(2167, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(2167, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(2167, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Dark Leather Cloak -- 2168
 	AddRecipe(2168, 110, 2316, Q.COMMON, V.ORIG, 110, 135, 147, 160)
 	self:AddRecipeFlags(2168, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.CLOAK)
-	self:AddRecipeTrainer(2168, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(2168, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Dark Leather Tunic -- 2169
 	AddRecipe(2169, 100, 2317, Q.UNCOMMON, V.ORIG, 100, 125, 137, 150)
 	self:AddRecipeFlags(2169, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(2169, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(2169, 2)

 	-- Light Leather -- 2881
 	AddRecipe(2881, 1, 2318, Q.COMMON, V.ORIG, 1, 20, 30, 40)
@@ -133,77 +133,77 @@ function addon:InitLeatherworking()
 	-- Handstitched Leather Belt -- 3753
 	AddRecipe(3753, 25, 4237, Q.COMMON, V.ORIG, 25, 55, 70, 85)
 	self:AddRecipeFlags(3753, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(3753, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 33635, 3605, 11098, 16728, 3549, 4588, 3365, 18771, 5127, 33612, 17442, 5564, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(3753, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 3365, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 5564, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Embossed Leather Gloves -- 3756
 	AddRecipe(3756, 55, 4239, Q.COMMON, V.ORIG, 55, 85, 100, 115)
 	self:AddRecipeFlags(3756, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(3756, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 16728, 3605, 11098, 33635, 3549, 4588, 5564, 18771, 5127, 33612, 17442, 3365, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(3756, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 5564, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 3365, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Embossed Leather Pants -- 3759
 	AddRecipe(3759, 75, 4242, Q.COMMON, V.ORIG, 75, 105, 120, 135)
 	self:AddRecipeFlags(3759, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(3759, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 16728, 3605, 11098, 33635, 3549, 4588, 5564, 18771, 5127, 33612, 17442, 3365, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(3759, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 5564, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 3365, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Hillman's Cloak -- 3760
 	AddRecipe(3760, 150, 3719, Q.COMMON, V.ORIG, 150, 170, 180, 190)
 	self:AddRecipeFlags(3760, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeTrainer(3760, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3760, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Fine Leather Tunic -- 3761
 	AddRecipe(3761, 85, 4243, Q.COMMON, V.ORIG, 85, 115, 130, 145)
 	self:AddRecipeFlags(3761, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(3761, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 16728, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 18771, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3761, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 5564, 4212, 8153, 4588, 18771, 16728, 33612, 17442, 3549, 3007, 5127, 16278, 21087, 33681, 33635)

 	-- Hillman's Leather Vest -- 3762
 	AddRecipe(3762, 100, 4244, Q.UNCOMMON, V.ORIG, 100, 125, 137, 150)
 	self:AddRecipeFlags(3762, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(3762, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3762, 2)

 	-- Fine Leather Belt -- 3763
 	AddRecipe(3763, 80, 4246, Q.COMMON, V.ORIG, 80, 110, 125, 140)
 	self:AddRecipeFlags(3763, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(3763, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 16728, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 18771, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3763, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 5564, 4212, 8153, 4588, 18771, 16728, 33612, 17442, 3549, 3007, 5127, 16278, 21087, 33681, 33635)

 	-- Hillman's Leather Gloves -- 3764
 	AddRecipe(3764, 145, 4247, Q.COMMON, V.ORIG, 145, 170, 182, 195)
 	self:AddRecipeFlags(3764, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeTrainer(3764, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3764, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Dark Leather Gloves -- 3765
 	AddRecipe(3765, 120, 4248, Q.UNCOMMON, V.ORIG, 120, 155, 167, 180)
 	self:AddRecipeFlags(3765, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeAcquire(3765, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3765, 2)

 	-- Dark Leather Belt -- 3766
 	AddRecipe(3766, 125, 4249, Q.COMMON, V.ORIG, 125, 150, 162, 175)
 	self:AddRecipeFlags(3766, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(3766, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 3605, 5564, 11098, 18771, 4212, 4588, 33681, 33635, 5127, 33612, 3549, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3766, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 3365, 3605, 11098, 1632, 4212, 4588, 18771, 33635, 5127, 33612, 16728, 8153, 3007, 3549, 16278, 21087, 33681, 5564)

 	-- Hillman's Belt -- 3767
 	AddRecipe(3767, 120, 4250, Q.UNCOMMON, V.ORIG, 120, 145, 157, 170)
 	self:AddRecipeFlags(3767, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(3767, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3767, 2)

 	-- Hillman's Shoulders -- 3768
 	AddRecipe(3768, 130, 4251, Q.COMMON, V.ORIG, 130, 155, 167, 180)
 	self:AddRecipeFlags(3768, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(3768, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 3605, 5564, 11098, 18771, 4212, 4588, 3549, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3768, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 3365, 3605, 11098, 18771, 4212, 4588, 3549, 33635, 5127, 33612, 17442, 16728, 3007, 8153, 16278, 21087, 1632, 5564)

 	-- Dark Leather Shoulders -- 3769
 	AddRecipe(3769, 140, 4252, Q.UNCOMMON, V.ORIG, 140, 165, 177, 190)
 	self:AddRecipeFlags(3769, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(3769, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3769, 2)

 	-- Toughened Leather Gloves -- 3770
 	AddRecipe(3770, 135, 4253, Q.COMMON, V.ORIG, 135, 160, 172, 185)
 	self:AddRecipeFlags(3770, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(3770, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3770, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Barbaric Gloves -- 3771
 	AddRecipe(3771, 150, 4254, Q.UNCOMMON, V.ORIG, 150, 170, 180, 190)
 	self:AddRecipeFlags(3771, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(3771, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3771, 2)

 	-- Green Leather Armor -- 3772
 	AddRecipe(3772, 155, 4255, Q.COMMON, V.ORIG, 155, 175, 185, 195)
@@ -213,27 +213,27 @@ function addon:InitLeatherworking()
 	-- Guardian Armor -- 3773
 	AddRecipe(3773, 175, 4256, Q.UNCOMMON, V.ORIG, 175, 195, 205, 215)
 	self:AddRecipeFlags(3773, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(3773, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3773, 2)

 	-- Green Leather Belt -- 3774
 	AddRecipe(3774, 160, 4257, Q.COMMON, V.ORIG, 160, 180, 190, 200)
 	self:AddRecipeFlags(3774, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.LEATHER)
-	self:AddRecipeTrainer(3774, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(3774, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Guardian Belt -- 3775
 	AddRecipe(3775, 170, 4258, Q.RARE, V.ORIG, 170, 190, 200, 210)
 	self:AddRecipeFlags(3775, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(3775, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(3775, 3)

 	-- Green Leather Bracers -- 3776
 	AddRecipe(3776, 180, 4259, Q.COMMON, V.ORIG, 180, 200, 210, 220)
 	self:AddRecipeFlags(3776, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.LEATHER)
-	self:AddRecipeTrainer(3776, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(3776, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Guardian Leather Bracers -- 3777
 	AddRecipe(3777, 195, 4260, Q.UNCOMMON, V.ORIG, 195, 215, 225, 235)
 	self:AddRecipeFlags(3777, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(3777, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3777, 2)

 	-- Gem-studded Leather Belt -- 3778
 	AddRecipe(3778, 185, 4262, Q.COMMON, V.ORIG, 185, 205, 215, 225)
@@ -243,27 +243,27 @@ function addon:InitLeatherworking()
 	-- Barbaric Belt -- 3779
 	AddRecipe(3779, 200, 4264, Q.RARE, V.ORIG, 200, 220, 230, 240)
 	self:AddRecipeFlags(3779, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(3779, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3779, 2)

 	-- Heavy Armor Kit -- 3780
 	AddRecipe(3780, 150, 4265, Q.COMMON, V.ORIG, 150, 170, 180, 190)
 	self:AddRecipeFlags(3780, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3780, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3780, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Cured Light Hide -- 3816
 	AddRecipe(3816, 35, 4231, Q.COMMON, V.ORIG, 35, 55, 65, 75)
 	self:AddRecipeFlags(3816, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3816, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 33635, 3605, 11098, 16728, 3549, 4588, 3365, 18771, 5127, 33612, 17442, 5564, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(3816, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 3365, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 5564, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Cured Medium Hide -- 3817
 	AddRecipe(3817, 100, 4233, Q.COMMON, V.ORIG, 100, 115, 122, 130)
 	self:AddRecipeFlags(3817, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3817, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 16728, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 18771, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3817, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 5564, 4212, 8153, 4588, 18771, 16728, 33612, 17442, 3549, 3007, 5127, 16278, 21087, 33681, 33635)

 	-- Cured Heavy Hide -- 3818
 	AddRecipe(3818, 150, 4236, Q.COMMON, V.ORIG, 150, 160, 165, 170)
 	self:AddRecipeFlags(3818, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3818, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(3818, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Raptor Hide Harness -- 4096
 	AddRecipe(4096, 165, 4455, Q.UNCOMMON, V.WOTLK, 165, 185, 195, 205)
@@ -278,12 +278,12 @@ function addon:InitLeatherworking()
 	-- Kodo Hide Bag -- 5244
 	AddRecipe(5244, 40, 5081, Q.UNCOMMON, V.ORIG, 40, 70, 85, 100)
 	self:AddRecipeFlags(5244, F.HORDE, F.QUEST, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(5244, A.QUEST, 769)
+	self:AddRecipeQuest(5244, 769)

 	-- Barbaric Harness -- 6661
 	AddRecipe(6661, 190, 5739, Q.COMMON, V.ORIG, 190, 210, 220, 230)
 	self:AddRecipeFlags(6661, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(6661, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(6661, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Murloc Scale Belt -- 6702
 	AddRecipe(6702, 90, 5780, Q.COMMON, V.ORIG, 90, 120, 135, 150)
@@ -317,37 +317,37 @@ function addon:InitLeatherworking()
 	-- Fine Leather Pants -- 7133
 	AddRecipe(7133, 105, 5958, Q.UNCOMMON, V.ORIG, 105, 130, 142, 155)
 	self:AddRecipeFlags(7133, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(7133, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7133, 2)

 	-- Dark Leather Pants -- 7135
 	AddRecipe(7135, 115, 5961, Q.COMMON, V.ORIG, 115, 140, 152, 165)
 	self:AddRecipeFlags(7135, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(7135, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(7135, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Guardian Pants -- 7147
 	AddRecipe(7147, 160, 5962, Q.COMMON, V.ORIG, 160, 180, 190, 200)
 	self:AddRecipeFlags(7147, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeTrainer(7147, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(7147, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Barbaric Leggings -- 7149
 	AddRecipe(7149, 170, 5963, Q.COMMON, V.ORIG, 170, 190, 200, 210)
 	self:AddRecipeFlags(7149, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeVendor(7149, 4877, 2810, 2821, 3958)
+	self:AddRecipeVendor(7149, 3958, 2810, 4877, 2821)

 	-- Barbaric Shoulders -- 7151
 	AddRecipe(7151, 175, 5964, Q.COMMON, V.ORIG, 175, 195, 205, 215)
 	self:AddRecipeFlags(7151, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(7151, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(7151, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Guardian Cloak -- 7153
 	AddRecipe(7153, 185, 5965, Q.UNCOMMON, V.ORIG, 185, 205, 215, 225)
 	self:AddRecipeFlags(7153, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeAcquire(7153, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7153, 2)

 	-- Guardian Gloves -- 7156
 	AddRecipe(7156, 190, 5966, Q.COMMON, V.ORIG, 190, 210, 220, 230)
 	self:AddRecipeFlags(7156, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeTrainer(7156, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(7156, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Deviate Scale Cloak -- 7953
 	AddRecipe(7953, 90, 6466, Q.COMMON, V.ORIG, 90, 120, 135, 150)
@@ -362,12 +362,12 @@ function addon:InitLeatherworking()
 	-- Deviate Scale Belt -- 7955
 	AddRecipe(7955, 115, 6468, Q.UNCOMMON, V.ORIG, 115, 140, 152, 165)
 	self:AddRecipeFlags(7955, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(7955, A.QUEST, 1487)
+	self:AddRecipeQuest(7955, 1487)

 	-- Moonglow Vest -- 8322
 	AddRecipe(8322, 90, 6709, Q.UNCOMMON, V.ORIG, 90, 115, 130, 145)
 	self:AddRecipeFlags(8322, F.ALLIANCE, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(8322, A.QUEST, 1582)
+	self:AddRecipeQuest(8322, 1582)

 	-- Handstitched Leather Cloak -- 9058
 	AddRecipe(9058, 1, 7276, Q.COMMON, V.ORIG, 1, 40, 55, 70)
@@ -382,27 +382,27 @@ function addon:InitLeatherworking()
 	-- Light Leather Quiver -- 9060
 	AddRecipe(9060, 30, 7278, Q.COMMON, V.ORIG, 30, 60, 75, 90)
 	self:AddRecipeFlags(9060, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(9060, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 33635, 3605, 11098, 16728, 3549, 4588, 3365, 18771, 5127, 33612, 17442, 5564, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(9060, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 3365, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 5564, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Small Leather Ammo Pouch -- 9062
 	AddRecipe(9062, 30, 7279, Q.COMMON, V.ORIG, 30, 60, 75, 90)
 	self:AddRecipeFlags(9062, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(9062, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 16728, 3605, 11098, 33635, 3549, 4588, 5564, 18771, 5127, 33612, 17442, 3365, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(9062, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 5564, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 3365, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Rugged Leather Pants -- 9064
 	AddRecipe(9064, 35, 7280, Q.UNCOMMON, V.ORIG, 35, 65, 80, 95)
 	self:AddRecipeFlags(9064, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeAcquire(9064, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9064, 2)

 	-- Light Leather Bracers -- 9065
 	AddRecipe(9065, 70, 7281, Q.COMMON, V.ORIG, 70, 100, 115, 130)
 	self:AddRecipeFlags(9065, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(9065, 1385, 3703, 16688, 8153, 5784, 33681, 3967, 19187, 11097, 18754, 16728, 3605, 11098, 33635, 3549, 4588, 5564, 18771, 5127, 33612, 17442, 3365, 3007, 3069, 16278, 21087, 1632, 4212)
+	self:AddRecipeTrainer(9065, 1385, 3703, 16688, 4212, 5784, 1632, 3967, 19187, 11097, 18754, 4588, 3605, 11098, 5564, 3549, 8153, 3069, 5127, 16728, 33612, 17442, 3365, 3007, 18771, 16278, 21087, 33681, 33635)

 	-- Light Leather Pants -- 9068
 	AddRecipe(9068, 95, 7282, Q.COMMON, V.ORIG, 95, 125, 140, 155)
 	self:AddRecipeFlags(9068, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(9068, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(9068, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Black Whelp Cloak -- 9070
 	AddRecipe(9070, 100, 7283, Q.COMMON, V.ORIG, 100, 125, 137, 150)
@@ -417,12 +417,12 @@ function addon:InitLeatherworking()
 	-- Nimble Leather Gloves -- 9074
 	AddRecipe(9074, 120, 7285, Q.COMMON, V.ORIG, 120, 145, 157, 170)
 	self:AddRecipeFlags(9074, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(9074, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(9074, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Fletcher's Gloves -- 9145
 	AddRecipe(9145, 125, 7348, Q.COMMON, V.ORIG, 125, 150, 162, 175)
 	self:AddRecipeFlags(9145, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(9145, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(9145, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Herbalist's Gloves -- 9146
 	AddRecipe(9146, 135, 7349, Q.UNCOMMON, V.ORIG, 135, 160, 172, 185)
@@ -437,47 +437,47 @@ function addon:InitLeatherworking()
 	-- Pilferer's Gloves -- 9148
 	AddRecipe(9148, 140, 7358, Q.UNCOMMON, V.ORIG, 140, 165, 177, 190)
 	self:AddRecipeFlags(9148, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(9148, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9148, 2)

 	-- Heavy Earthen Gloves -- 9149
 	AddRecipe(9149, 145, 7359, Q.UNCOMMON, V.ORIG, 145, 170, 182, 195)
 	self:AddRecipeFlags(9149, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(9149, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9149, 2)

 	-- Heavy Quiver -- 9193
 	AddRecipe(9193, 150, 7371, Q.COMMON, V.ORIG, 150, 170, 180, 190)
 	self:AddRecipeFlags(9193, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(9193, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(9193, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Heavy Leather Ammo Pouch -- 9194
 	AddRecipe(9194, 150, 7372, Q.COMMON, V.ORIG, 150, 170, 180, 190)
 	self:AddRecipeFlags(9194, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(9194, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(9194, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Dusky Leather Leggings -- 9195
 	AddRecipe(9195, 165, 7373, Q.UNCOMMON, V.ORIG, 165, 185, 195, 205)
 	self:AddRecipeFlags(9195, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(9195, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9195, 2)

 	-- Dusky Leather Armor -- 9196
 	AddRecipe(9196, 175, 7374, Q.COMMON, V.ORIG, 175, 195, 205, 215)
 	self:AddRecipeFlags(9196, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(9196, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(9196, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Green Whelp Armor -- 9197
 	AddRecipe(9197, 175, 7375, Q.UNCOMMON, V.ORIG, 175, 195, 205, 215)
 	self:AddRecipeFlags(9197, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(9197, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9197, 2)

 	-- Frost Leather Cloak -- 9198
 	AddRecipe(9198, 180, 7377, Q.COMMON, V.ORIG, 180, 200, 210, 220)
 	self:AddRecipeFlags(9198, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeTrainer(9198, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(9198, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Dusky Bracers -- 9201
 	AddRecipe(9201, 185, 7378, Q.COMMON, V.ORIG, 185, 205, 215, 225)
 	self:AddRecipeFlags(9201, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(9201, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(9201, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Green Whelp Bracers -- 9202
 	AddRecipe(9202, 190, 7386, Q.UNCOMMON, V.ORIG, 190, 210, 220, 230)
@@ -487,42 +487,42 @@ function addon:InitLeatherworking()
 	-- Dusky Belt -- 9206
 	AddRecipe(9206, 195, 7387, Q.COMMON, V.ORIG, 195, 215, 225, 235)
 	self:AddRecipeFlags(9206, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(9206, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(9206, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Dusky Boots -- 9207
 	AddRecipe(9207, 200, 7390, Q.RARE, V.ORIG, 200, 220, 230, 240)
 	self:AddRecipeFlags(9207, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(9207, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9207, 2)

 	-- Swift Boots -- 9208
 	AddRecipe(9208, 200, 7391, Q.UNCOMMON, V.ORIG, 200, 220, 230, 240)
 	self:AddRecipeFlags(9208, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeAcquire(9208, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(9208, 2)

 	-- Cured Thick Hide -- 10482
 	AddRecipe(10482, 200, 8172, Q.COMMON, V.ORIG, 200, 200, 200, 200)
 	self:AddRecipeFlags(10482, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(10482, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10482, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Thick Armor Kit -- 10487
 	AddRecipe(10487, 200, 8173, Q.COMMON, V.ORIG, 200, 220, 230, 240)
 	self:AddRecipeFlags(10487, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(10487, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10487, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Comfortable Leather Hat -- 10490
 	AddRecipe(10490, 200, 8174, Q.RARE, V.ORIG, 200, 220, 230, 240)
 	self:AddRecipeFlags(10490, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeAcquire(10490, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(10490, 2)

 	-- Nightscape Tunic -- 10499
 	AddRecipe(10499, 205, 8175, Q.COMMON, V.ORIG, 205, 225, 235, 245)
 	self:AddRecipeFlags(10499, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(10499, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10499, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Nightscape Headband -- 10507
 	AddRecipe(10507, 205, 8176, Q.COMMON, V.ORIG, 205, 225, 235, 245)
 	self:AddRecipeFlags(10507, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(10507, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10507, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Turtle Scale Gloves -- 10509
 	AddRecipe(10509, 205, 8187, Q.COMMON, V.ORIG, 205, 225, 235, 245)
@@ -532,7 +532,7 @@ function addon:InitLeatherworking()
 	-- Turtle Scale Breastplate -- 10511
 	AddRecipe(10511, 210, 8189, Q.COMMON, V.ORIG, 210, 230, 240, 250)
 	self:AddRecipeFlags(10511, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.MAIL)
-	self:AddRecipeTrainer(10511, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10511, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Nightscape Shoulders -- 10516
 	AddRecipe(10516, 210, 8192, Q.UNCOMMON, V.ORIG, 210, 230, 240, 250)
@@ -542,12 +542,12 @@ function addon:InitLeatherworking()
 	-- Turtle Scale Bracers -- 10518
 	AddRecipe(10518, 210, 8198, Q.COMMON, V.ORIG, 210, 230, 240, 250)
 	self:AddRecipeFlags(10518, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.MAIL)
-	self:AddRecipeTrainer(10518, 1385, 3703, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10518, 1385, 3703, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 3549, 3365, 4212, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 4588)

 	-- Big Voodoo Robe -- 10520
 	AddRecipe(10520, 215, 8200, Q.UNCOMMON, V.ORIG, 215, 235, 245, 255)
 	self:AddRecipeFlags(10520, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(10520, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(10520, 2)

 	-- Tough Scorpid Breastplate -- 10525
 	AddRecipe(10525, 220, 8203, Q.UNCOMMON, V.ORIG, 220, 240, 250, 260)
@@ -557,12 +557,12 @@ function addon:InitLeatherworking()
 	-- Wild Leather Shoulders -- 10529
 	AddRecipe(10529, 220, 8210, Q.UNCOMMON, V.ORIG, 220, 240, 250, 260)
 	self:AddRecipeFlags(10529, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeAcquire(10529, A.QUEST, 2848, A.QUEST, 2855)
+	self:AddRecipeQuest(10529, 2848, 2855)

 	-- Big Voodoo Mask -- 10531
 	AddRecipe(10531, 220, 8201, Q.UNCOMMON, V.ORIG, 220, 240, 250, 260)
 	self:AddRecipeFlags(10531, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(10531, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(10531, 2)

 	-- Tough Scorpid Bracers -- 10533
 	AddRecipe(10533, 220, 8205, Q.UNCOMMON, V.ORIG, 220, 240, 250, 260)
@@ -577,22 +577,22 @@ function addon:InitLeatherworking()
 	-- Wild Leather Vest -- 10544
 	AddRecipe(10544, 225, 8211, Q.UNCOMMON, V.ORIG, 225, 245, 255, 265)
 	self:AddRecipeFlags(10544, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeAcquire(10544, A.QUEST, 2849, A.QUEST, 2856)
+	self:AddRecipeQuest(10544, 2849, 2856)

 	-- Wild Leather Helmet -- 10546
 	AddRecipe(10546, 225, 8214, Q.UNCOMMON, V.ORIG, 225, 245, 255, 265)
 	self:AddRecipeFlags(10546, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeAcquire(10546, A.QUEST, 2850, A.QUEST, 2857)
+	self:AddRecipeQuest(10546, 2850, 2857)

 	-- Nightscape Pants -- 10548
 	AddRecipe(10548, 230, 8193, Q.COMMON, V.ORIG, 230, 250, 260, 270)
 	self:AddRecipeFlags(10548, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(10548, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10548, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Turtle Scale Helm -- 10552
 	AddRecipe(10552, 230, 8191, Q.COMMON, V.ORIG, 230, 250, 260, 270)
 	self:AddRecipeFlags(10552, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.MAIL)
-	self:AddRecipeTrainer(10552, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10552, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Tough Scorpid Boots -- 10554
 	AddRecipe(10554, 235, 8209, Q.UNCOMMON, V.ORIG, 235, 255, 265, 275)
@@ -602,22 +602,22 @@ function addon:InitLeatherworking()
 	-- Turtle Scale Leggings -- 10556
 	AddRecipe(10556, 235, 8185, Q.COMMON, V.ORIG, 235, 255, 265, 275)
 	self:AddRecipeFlags(10556, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.MAIL)
-	self:AddRecipeTrainer(10556, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 4588, 33635, 18771, 5127, 4212, 3365, 5564, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10556, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 11098, 33635, 18771, 1632, 3549, 3365, 4212, 16728, 5127, 33612, 17442, 5564, 3007, 8153, 16278, 21087, 33681, 4588)

 	-- Nightscape Boots -- 10558
 	AddRecipe(10558, 235, 8197, Q.COMMON, V.ORIG, 235, 255, 265, 275)
 	self:AddRecipeFlags(10558, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(10558, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(10558, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Big Voodoo Pants -- 10560
 	AddRecipe(10560, 240, 8202, Q.UNCOMMON, V.ORIG, 240, 260, 270, 280)
 	self:AddRecipeFlags(10560, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(10560, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(10560, 2)

 	-- Big Voodoo Cloak -- 10562
 	AddRecipe(10562, 240, 8216, Q.UNCOMMON, V.ORIG, 240, 260, 270, 280)
 	self:AddRecipeFlags(10562, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeAcquire(10562, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(10562, 2)

 	-- Tough Scorpid Shoulders -- 10564
 	AddRecipe(10564, 240, 8207, Q.UNCOMMON, V.ORIG, 240, 260, 270, 280)
@@ -627,7 +627,7 @@ function addon:InitLeatherworking()
 	-- Wild Leather Boots -- 10566
 	AddRecipe(10566, 245, 8213, Q.UNCOMMON, V.ORIG, 245, 265, 275, 285)
 	self:AddRecipeFlags(10566, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeAcquire(10566, A.QUEST, 2851, A.QUEST, 2858)
+	self:AddRecipeQuest(10566, 2851, 2858)

 	-- Tough Scorpid Leggings -- 10568
 	AddRecipe(10568, 245, 8206, Q.UNCOMMON, V.ORIG, 245, 265, 275, 285)
@@ -642,12 +642,12 @@ function addon:InitLeatherworking()
 	-- Wild Leather Leggings -- 10572
 	AddRecipe(10572, 250, 8212, Q.UNCOMMON, V.ORIG, 250, 270, 280, 290)
 	self:AddRecipeFlags(10572, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeAcquire(10572, A.QUEST, 2852, A.QUEST, 2859)
+	self:AddRecipeQuest(10572, 2852, 2859)

 	-- Wild Leather Cloak -- 10574
 	AddRecipe(10574, 250, 8215, Q.UNCOMMON, V.ORIG, 250, 270, 280, 290)
 	self:AddRecipeFlags(10574, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.CLOAK)
-	self:AddRecipeAcquire(10574, A.QUEST, 2853, A.QUEST, 2860)
+	self:AddRecipeQuest(10574, 2853, 2860)

 	-- Dragonscale Gauntlets -- 10619
 	AddRecipe(10619, 225, 8347, Q.COMMON, V.ORIG, 225, 245, 255, 265)
@@ -682,17 +682,17 @@ function addon:InitLeatherworking()
 	-- Quickdraw Quiver -- 14930
 	AddRecipe(14930, 225, 8217, Q.COMMON, V.ORIG, 225, 245, 255, 265)
 	self:AddRecipeFlags(14930, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.DPS)
-	self:AddRecipeTrainer(14930, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(14930, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Thick Leather Ammo Pouch -- 14932
 	AddRecipe(14932, 225, 8218, Q.COMMON, V.ORIG, 225, 245, 255, 265)
 	self:AddRecipeFlags(14932, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.AMMO)
-	self:AddRecipeTrainer(14932, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(14932, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Cured Rugged Hide -- 19047
 	AddRecipe(19047, 250, 15407, Q.COMMON, V.ORIG, 250, 250, 255, 260)
 	self:AddRecipeFlags(19047, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(19047, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(19047, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Heavy Scorpid Bracers -- 19048
 	AddRecipe(19048, 255, 15077, Q.COMMON, V.ORIG, 255, 275, 285, 295)
@@ -717,7 +717,7 @@ function addon:InitLeatherworking()
 	-- Wicked Leather Bracers -- 19052
 	AddRecipe(19052, 265, 15084, Q.UNCOMMON, V.ORIG, 265, 285, 295, 305)
 	self:AddRecipeFlags(19052, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(19052, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(19052, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Chimeric Gloves -- 19053
 	AddRecipe(19053, 265, 15074, Q.COMMON, V.ORIG, 265, 285, 295, 305)
@@ -732,13 +732,13 @@ function addon:InitLeatherworking()
 	-- Runic Leather Gauntlets -- 19055
 	AddRecipe(19055, 270, 15091, Q.UNCOMMON, V.ORIG, 270, 290, 300, 310)
 	self:AddRecipeFlags(19055, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeTrainer(19055, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
-	self:AddRecipeAcquire(19055, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(19055, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)
+	self:AddRecipeWorldDrop(19055, 2)

 	-- Rugged Armor Kit -- 19058
 	AddRecipe(19058, 250, 15564, Q.COMMON, V.ORIG, 250, 255, 265, 275)
 	self:AddRecipeFlags(19058, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(19058, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 3605, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 18771, 21087, 1632, 3365)
+	self:AddRecipeTrainer(19058, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 3365, 3605, 11098, 1632, 4212, 8153, 4588, 18771, 5127, 33612, 17442, 16728, 3007, 3549, 5564, 21087, 33681, 33635)

 	-- Volcanic Leggings -- 19059
 	AddRecipe(19059, 270, 15054, Q.UNCOMMON, V.ORIG, 270, 290, 300, 310)
@@ -763,7 +763,7 @@ function addon:InitLeatherworking()
 	-- Chimeric Boots -- 19063
 	AddRecipe(19063, 275, 15073, Q.UNCOMMON, V.ORIG, 275, 295, 305, 315)
 	self:AddRecipeFlags(19063, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeAcquire(19063, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(19063, 2)

 	-- Heavy Scorpid Gauntlets -- 19064
 	AddRecipe(19064, 275, 15078, Q.UNCOMMON, V.ORIG, 275, 295, 305, 315)
@@ -773,7 +773,7 @@ function addon:InitLeatherworking()
 	-- Runic Leather Bracers -- 19065
 	AddRecipe(19065, 275, 15092, Q.UNCOMMON, V.ORIG, 275, 295, 305, 315)
 	self:AddRecipeFlags(19065, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeTrainer(19065, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 4588, 33635, 18771, 5127, 4212, 3365, 5564, 3605, 16728, 33612, 17442, 8153, 3007, 33681, 3549, 21087, 1632, 11098)
+	self:AddRecipeTrainer(19065, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 11098, 33635, 18771, 1632, 4212, 3365, 3605, 3549, 5127, 33612, 17442, 5564, 3007, 8153, 16728, 21087, 33681, 4588)

 	-- Frostsaber Boots -- 19066
 	AddRecipe(19066, 275, 15071, Q.COMMON, V.ORIG, 275, 295, 305, 315)
@@ -793,22 +793,22 @@ function addon:InitLeatherworking()
 	-- Heavy Scorpid Belt -- 19070
 	AddRecipe(19070, 280, 15082, Q.UNCOMMON, V.ORIG, 280, 300, 310, 320)
 	self:AddRecipeFlags(19070, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(19070, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(19070, 2)

 	-- Wicked Leather Headband -- 19071
 	AddRecipe(19071, 280, 15086, Q.UNCOMMON, V.ORIG, 280, 300, 310, 320)
 	self:AddRecipeFlags(19071, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(19071, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(19071, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Runic Leather Belt -- 19072
 	AddRecipe(19072, 280, 15093, Q.UNCOMMON, V.ORIG, 280, 300, 310, 320)
 	self:AddRecipeFlags(19072, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeTrainer(19072, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(19072, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Chimeric Leggings -- 19073
 	AddRecipe(19073, 280, 15072, Q.UNCOMMON, V.ORIG, 280, 300, 310, 320)
 	self:AddRecipeFlags(19073, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeAcquire(19073, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(19073, 2)

 	-- Frostsaber Leggings -- 19074
 	AddRecipe(19074, 285, 15069, Q.UNCOMMON, V.ORIG, 285, 305, 315, 325)
@@ -848,17 +848,17 @@ function addon:InitLeatherworking()
 	-- Chimeric Vest -- 19081
 	AddRecipe(19081, 290, 15075, Q.UNCOMMON, V.ORIG, 290, 310, 320, 330)
 	self:AddRecipeFlags(19081, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeAcquire(19081, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(19081, 2)

 	-- Runic Leather Headband -- 19082
 	AddRecipe(19082, 290, 15094, Q.COMMON, V.ORIG, 290, 310, 320, 330)
 	self:AddRecipeFlags(19082, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeTrainer(19082, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(19082, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Wicked Leather Pants -- 19083
 	AddRecipe(19083, 290, 15087, Q.UNCOMMON, V.ORIG, 290, 315, 325, 335)
 	self:AddRecipeFlags(19083, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(19083, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(19083, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Devilsaur Gauntlets -- 19084
 	AddRecipe(19084, 290, 15063, Q.COMMON, V.ORIG, 290, 310, 320, 330)
@@ -898,17 +898,18 @@ function addon:InitLeatherworking()
 	-- Runic Leather Pants -- 19091
 	AddRecipe(19091, 300, 15095, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(19091, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeTrainer(19091, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 4588, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(19091, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 11098, 33635, 18771, 1632, 4212, 3365, 4588, 3605, 16728, 33612, 17442, 3549, 3007, 8153, 16278, 21087, 33681, 5564)

 	-- Wicked Leather Belt -- 19092
 	AddRecipe(19092, 300, 15088, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(19092, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(19092, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(19092, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Onyxia Scale Cloak -- 19093
 	AddRecipe(19093, 300, 15138, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(19093, F.ALLIANCE, F.HORDE, F.RAID, F.QUEST, F.IBOE, F.RBOP, F.CLOAK)
-	self:AddRecipeAcquire(19093, A.QUEST, 7493, A.QUEST, 7497, A.CUSTOM, 10)
+	self:AddRecipeQuest(19093, 7493, 7497)
+	self:AddRecipeAcquire(19093, A.CUSTOM, 10)

 	-- Black Dragonscale Shoulders -- 19094
 	AddRecipe(19094, 300, 15051, Q.RARE, V.ORIG, 300, 320, 330, 340)
@@ -923,12 +924,12 @@ function addon:InitLeatherworking()
 	-- Devilsaur Leggings -- 19097
 	AddRecipe(19097, 300, 15062, Q.RARE, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(19097, F.ALLIANCE, F.HORDE, F.MOB_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeMobDrop(19097, 9477, 6556, 6557, 6559)
+	self:AddRecipeMobDrop(19097, 6559, 6556, 9477, 6557)

 	-- Wicked Leather Armor -- 19098
 	AddRecipe(19098, 300, 15085, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(19098, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeTrainer(19098, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(19098, 1385, 3703, 16688, 5784, 3967, 19187, 11097, 18754, 3365, 33635, 18771, 1632, 4212, 8153, 4588, 5564, 5127, 33612, 17442, 16728, 3007, 3549, 16278, 21087, 33681, 11098)

 	-- Heavy Scorpid Shoulders -- 19100
 	AddRecipe(19100, 300, 15081, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
@@ -943,12 +944,12 @@ function addon:InitLeatherworking()
 	-- Runic Leather Armor -- 19102
 	AddRecipe(19102, 300, 15090, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(19102, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeTrainer(19102, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(19102, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Runic Leather Shoulders -- 19103
 	AddRecipe(19103, 300, 15096, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
 	self:AddRecipeFlags(19103, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.LEATHER)
-	self:AddRecipeTrainer(19103, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(19103, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 4588, 4212, 8153, 18771, 16728, 5127, 33612, 17442, 3549, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Frostsaber Tunic -- 19104
 	AddRecipe(19104, 300, 15068, Q.UNCOMMON, V.ORIG, 300, 320, 330, 340)
@@ -963,17 +964,17 @@ function addon:InitLeatherworking()
 	-- Medium Leather -- 20648
 	AddRecipe(20648, 100, 2319, Q.COMMON, V.ORIG, 100, 100, 105, 110)
 	self:AddRecipeFlags(20648, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(20648, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 16728, 5564, 11098, 33635, 4212, 4588, 8153, 33681, 5127, 33612, 17442, 3549, 3007, 18771, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(20648, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 11098, 5564, 4212, 8153, 4588, 18771, 16728, 33612, 17442, 3549, 3007, 5127, 16278, 21087, 33681, 33635)

 	-- Heavy Leather -- 20649
 	AddRecipe(20649, 150, 4234, Q.COMMON, V.ORIG, 150, 150, 155, 160)
 	self:AddRecipeFlags(20649, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(20649, 1385, 3703, 16688, 5784, 3605, 3967, 19187, 11097, 18754, 18771, 5564, 11098, 3549, 4212, 4588, 33681, 33635, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 1632, 3365)
+	self:AddRecipeTrainer(20649, 1385, 3703, 16688, 5784, 3365, 3967, 19187, 11097, 18754, 1632, 3605, 18771, 3549, 4212, 4588, 11098, 16728, 5127, 33612, 17442, 8153, 3007, 33635, 16278, 21087, 33681, 5564)

 	-- Thick Leather -- 20650
 	AddRecipe(20650, 200, 4304, Q.COMMON, V.ORIG, 200, 200, 202, 205)
 	self:AddRecipeFlags(20650, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(20650, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(20650, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Corehound Boots -- 20853
 	AddRecipe(20853, 295, 16982, Q.COMMON, V.ORIG, 295, 315, 325, 335)
@@ -998,7 +999,7 @@ function addon:InitLeatherworking()
 	-- Rugged Leather -- 22331
 	AddRecipe(22331, 250, 8170, Q.COMMON, V.ORIG, 250, 250, 250, 250)
 	self:AddRecipeFlags(22331, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.LEATHER)
-	self:AddRecipeTrainer(22331, 1385, 3703, 16688, 5784, 4588, 3967, 19187, 11097, 18754, 5127, 33635, 18771, 5564, 4212, 3365, 3605, 3549, 16728, 33612, 17442, 8153, 3007, 33681, 16278, 21087, 1632, 11098)
+	self:AddRecipeTrainer(22331, 1385, 3703, 16688, 5784, 11098, 3967, 19187, 11097, 18754, 1632, 33635, 18771, 3605, 4212, 4588, 3549, 5564, 5127, 33612, 17442, 8153, 3007, 16728, 16278, 21087, 33681, 3365)

 	-- Shadowskin Gloves -- 22711
 	AddRecipe(22711, 200, 18238, Q.COMMON, V.ORIG, 200, 210, 220, 230)
@@ -1013,7 +1014,7 @@ function addon:InitLeatherworking()
 	-- Gordok Ogre Suit -- 22815
 	AddRecipe(22815, 275, 18258, Q.UNCOMMON, V.ORIG, 275, 285, 290, 385)
 	self:AddRecipeFlags(22815, F.ALLIANCE, F.HORDE, F.INSTANCE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(22815, A.QUEST, 5518)
+	self:AddRecipeQuest(22815, 5518)

 	-- Girdle of Insight -- 22921
 	AddRecipe(22921, 300, 18504, Q.RARE, V.ORIG, 300, 320, 330, 340)
@@ -1565,23 +1566,23 @@ function addon:InitLeatherworking()
 	-- Cobrascale Hood -- 35558
 	AddRecipe(35558, 365, 29502, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35558, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(35558, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35558, 4)

 	-- Cobrascale Gloves -- 35559
 	AddRecipe(35559, 365, 29503, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35559, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
 	self:AddRecipeMobDrop(35559, 24664)
-	self:AddRecipeAcquire(35559, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35559, 4)

 	-- Windscale Hood -- 35560
 	AddRecipe(35560, 365, 29504, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35560, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(35560, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35560, 4)

 	-- Hood of Primal Life -- 35561
 	AddRecipe(35561, 365, 29505, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35561, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.LEATHER)
-	self:AddRecipeAcquire(35561, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35561, 4)

 	-- Gloves of the Living Touch -- 35562
 	AddRecipe(35562, 365, 29506, Q.EPIC, V.TBC, 365, 375, 385, 395)
@@ -1591,17 +1592,17 @@ function addon:InitLeatherworking()
 	-- Windslayer Wraps -- 35563
 	AddRecipe(35563, 365, 29507, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35563, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
-	self:AddRecipeAcquire(35563, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35563, 4)

 	-- Living Dragonscale Helm -- 35564
 	AddRecipe(35564, 365, 29508, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35564, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.MAIL)
-	self:AddRecipeAcquire(35564, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35564, 4)

 	-- Earthen Netherscale Boots -- 35567
 	AddRecipe(35567, 365, 29512, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35567, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(35567, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35567, 4)

 	-- Windstrike Gloves -- 35568
 	AddRecipe(35568, 365, 29509, Q.EPIC, V.TBC, 365, 375, 385, 395)
@@ -1611,7 +1612,7 @@ function addon:InitLeatherworking()
 	-- Netherdrake Helm -- 35572
 	AddRecipe(35572, 365, 29510, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35572, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(35572, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35572, 4)

 	-- Netherdrake Gloves -- 35573
 	AddRecipe(35573, 365, 29511, Q.EPIC, V.TBC, 365, 375, 385, 395)
@@ -1621,7 +1622,7 @@ function addon:InitLeatherworking()
 	-- Thick Netherscale Breastplate -- 35574
 	AddRecipe(35574, 365, 29514, Q.EPIC, V.TBC, 365, 375, 385, 395)
 	self:AddRecipeFlags(35574, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL)
-	self:AddRecipeAcquire(35574, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(35574, 4)

 	-- Ebon Netherscale Breastplate -- 35575
 	AddRecipe(35575, 375, 29515, Q.COMMON, V.TBC, 375, 385, 395, 405, 10657)
diff --git a/Database/Tailoring.lua b/Database/Tailoring.lua
index 2521513..d52b75c 100644
--- a/Database/Tailoring.lua
+++ b/Database/Tailoring.lua
@@ -53,12 +53,12 @@ function addon:InitTailoring()
 	-- Brown Linen Vest -- 2385
 	AddRecipe(2385, 10, 2568, Q.COMMON, V.ORIG, 10, 45, 57, 70)
 	self:AddRecipeFlags(2385, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(2385, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2385, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Linen Boots -- 2386
 	AddRecipe(2386, 65, 2569, Q.COMMON, V.ORIG, 65, 90, 107, 125)
 	self:AddRecipeFlags(2386, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(2386, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2386, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Linen Cloak -- 2387
 	AddRecipe(2387, 1, 2570, Q.COMMON, V.ORIG, 1, 35, 47, 60)
@@ -68,62 +68,62 @@ function addon:InitTailoring()
 	-- Red Linen Robe -- 2389
 	AddRecipe(2389, 40, 2572, Q.UNCOMMON, V.ORIG, 40, 65, 82, 100)
 	self:AddRecipeFlags(2389, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(2389, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(2389, 2)

 	-- Red Linen Shirt -- 2392
 	AddRecipe(2392, 40, 2575, Q.COMMON, V.ORIG, 40, 65, 82, 100)
 	self:AddRecipeFlags(2392, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2392, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2392, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- White Linen Shirt -- 2393
 	AddRecipe(2393, 1, 2576, Q.COMMON, V.ORIG, 1, 35, 47, 60)
 	self:AddRecipeFlags(2393, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2393, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2393, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Blue Linen Shirt -- 2394
 	AddRecipe(2394, 40, 2577, Q.COMMON, V.ORIG, 40, 65, 82, 100)
 	self:AddRecipeFlags(2394, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2394, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2394, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Barbaric Linen Vest -- 2395
 	AddRecipe(2395, 70, 2578, Q.COMMON, V.ORIG, 70, 95, 112, 130)
 	self:AddRecipeFlags(2395, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(2395, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2395, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Green Linen Shirt -- 2396
 	AddRecipe(2396, 70, 2579, Q.COMMON, V.ORIG, 70, 95, 112, 130)
 	self:AddRecipeFlags(2396, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2396, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2396, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Reinforced Linen Cape -- 2397
 	AddRecipe(2397, 60, 2580, Q.COMMON, V.ORIG, 60, 85, 102, 120)
 	self:AddRecipeFlags(2397, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOAK)
-	self:AddRecipeTrainer(2397, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2397, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Green Woolen Vest -- 2399
 	AddRecipe(2399, 85, 2582, Q.COMMON, V.ORIG, 85, 110, 127, 145)
 	self:AddRecipeFlags(2399, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(2399, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(2399, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Woolen Boots -- 2401
 	AddRecipe(2401, 95, 2583, Q.COMMON, V.ORIG, 95, 120, 137, 155)
 	self:AddRecipeFlags(2401, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(2401, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(2401, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Woolen Cape -- 2402
 	AddRecipe(2402, 75, 2584, Q.COMMON, V.ORIG, 75, 100, 117, 135)
 	self:AddRecipeFlags(2402, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOAK)
-	self:AddRecipeTrainer(2402, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2402, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Gray Woolen Robe -- 2403
 	AddRecipe(2403, 105, 2585, Q.UNCOMMON, V.ORIG, 105, 130, 147, 165)
 	self:AddRecipeFlags(2403, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(2403, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(2403, 2)

 	-- Gray Woolen Shirt -- 2406
 	AddRecipe(2406, 100, 2587, Q.COMMON, V.ORIG, 100, 110, 120, 130)
 	self:AddRecipeFlags(2406, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(2406, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(2406, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Bolt of Linen Cloth -- 2963
 	AddRecipe(2963, 1, 2996, Q.COMMON, V.ORIG, 1, 25, 37, 50)
@@ -133,92 +133,92 @@ function addon:InitTailoring()
 	-- Bolt of Woolen Cloth -- 2964
 	AddRecipe(2964, 75, 2997, Q.COMMON, V.ORIG, 75, 90, 97, 105)
 	self:AddRecipeFlags(2964, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(2964, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(2964, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Linen Bag -- 3755
 	AddRecipe(3755, 45, 4238, Q.COMMON, V.ORIG, 45, 70, 87, 105)
 	self:AddRecipeFlags(3755, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3755, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 3704, 11052, 28699, 18772, 4193, 2627, 11557, 16729, 17487, 1346, 26914, 4159, 3363, 16640, 2399)
+	self:AddRecipeTrainer(3755, 3484, 33684, 18749, 3523, 2399, 16640, 16366, 3004, 3363, 4159, 11052, 5153, 1346, 27001, 33636, 17487, 3704, 16729, 2627, 4193, 33580, 11557, 33613, 18772, 28699, 26914, 1103, 26969, 4576, 26964)

 	-- Woolen Bag -- 3757
 	AddRecipe(3757, 80, 4240, Q.COMMON, V.ORIG, 80, 105, 122, 140)
 	self:AddRecipeFlags(3757, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3757, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3757, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Green Woolen Bag -- 3758
 	AddRecipe(3758, 95, 4241, Q.UNCOMMON, V.ORIG, 95, 120, 137, 155)
 	self:AddRecipeFlags(3758, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3758, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3758, 2)

 	-- Small Silk Pack -- 3813
 	AddRecipe(3813, 150, 4245, Q.COMMON, V.ORIG, 150, 170, 185, 200)
 	self:AddRecipeFlags(3813, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3813, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3813, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Bolt of Silk Cloth -- 3839
 	AddRecipe(3839, 125, 4305, Q.COMMON, V.ORIG, 125, 135, 140, 145)
 	self:AddRecipeFlags(3839, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(3839, 28699, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 2399, 5153, 11052, 27001, 4576, 33636, 3704, 33613, 1103, 17487, 2627, 11557, 16729, 33580, 1346, 26914, 4159, 3363, 3484, 16640)
+	self:AddRecipeTrainer(3839, 2399, 33684, 26964, 3523, 16640, 3484, 16366, 3004, 3363, 4159, 33636, 26969, 1346, 27001, 4576, 33580, 11052, 16729, 17487, 4193, 2627, 11557, 33613, 18772, 3704, 26914, 1103, 5153, 18749, 28699)

 	-- Heavy Linen Gloves -- 3840
 	AddRecipe(3840, 35, 4307, Q.COMMON, V.ORIG, 35, 60, 77, 95)
 	self:AddRecipeFlags(3840, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3840, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(3840, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Green Linen Bracers -- 3841
 	AddRecipe(3841, 60, 4308, Q.COMMON, V.ORIG, 60, 85, 102, 120)
 	self:AddRecipeFlags(3841, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(3841, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(3841, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Handstitched Linen Britches -- 3842
 	AddRecipe(3842, 70, 4309, Q.COMMON, V.ORIG, 70, 95, 112, 130)
 	self:AddRecipeFlags(3842, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3842, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(3842, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Heavy Woolen Gloves -- 3843
 	AddRecipe(3843, 85, 4310, Q.COMMON, V.ORIG, 85, 110, 127, 145)
 	self:AddRecipeFlags(3843, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3843, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3843, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Heavy Woolen Cloak -- 3844
 	AddRecipe(3844, 100, 4311, Q.UNCOMMON, V.ORIG, 100, 125, 142, 160)
 	self:AddRecipeFlags(3844, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeAcquire(3844, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3844, 2)

 	-- Soft-soled Linen Boots -- 3845
 	AddRecipe(3845, 80, 4312, Q.COMMON, V.ORIG, 80, 105, 122, 140)
 	self:AddRecipeFlags(3845, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(3845, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3845, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Red Woolen Boots -- 3847
 	AddRecipe(3847, 95, 4313, Q.UNCOMMON, V.ORIG, 95, 120, 137, 155)
 	self:AddRecipeFlags(3847, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3847, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3847, 2)

 	-- Double-stitched Woolen Shoulders -- 3848
 	AddRecipe(3848, 110, 4314, Q.COMMON, V.ORIG, 110, 135, 152, 170)
 	self:AddRecipeFlags(3848, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(3848, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3848, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Reinforced Woolen Shoulders -- 3849
 	AddRecipe(3849, 120, 4315, Q.UNCOMMON, V.ORIG, 120, 145, 162, 180)
 	self:AddRecipeFlags(3849, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3849, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3849, 2)

 	-- Heavy Woolen Pants -- 3850
 	AddRecipe(3850, 110, 4316, Q.COMMON, V.ORIG, 110, 135, 152, 170)
 	self:AddRecipeFlags(3850, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3850, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3850, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Phoenix Pants -- 3851
 	AddRecipe(3851, 125, 4317, Q.UNCOMMON, V.ORIG, 125, 150, 167, 185)
 	self:AddRecipeFlags(3851, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3851, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3851, 2)

 	-- Gloves of Meditation -- 3852
 	AddRecipe(3852, 130, 4318, Q.COMMON, V.ORIG, 130, 150, 165, 180)
 	self:AddRecipeFlags(3852, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3852, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3852, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Azure Silk Gloves -- 3854
 	AddRecipe(3854, 145, 4319, Q.COMMON, V.ORIG, 145, 165, 180, 195)
@@ -228,12 +228,12 @@ function addon:InitTailoring()
 	-- Spidersilk Boots -- 3855
 	AddRecipe(3855, 125, 4320, Q.COMMON, V.ORIG, 125, 150, 167, 185)
 	self:AddRecipeFlags(3855, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3855, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3855, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Spider Silk Slippers -- 3856
 	AddRecipe(3856, 140, 4321, Q.UNCOMMON, V.ORIG, 140, 160, 175, 190)
 	self:AddRecipeFlags(3856, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3856, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3856, 2)

 	-- Enchanter's Cowl -- 3857
 	AddRecipe(3857, 165, 4322, Q.COMMON, V.ORIG, 165, 185, 200, 215)
@@ -243,22 +243,22 @@ function addon:InitTailoring()
 	-- Shadow Hood -- 3858
 	AddRecipe(3858, 170, 4323, Q.UNCOMMON, V.ORIG, 170, 190, 205, 220)
 	self:AddRecipeFlags(3858, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3858, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3858, 2)

 	-- Azure Silk Vest -- 3859
 	AddRecipe(3859, 150, 4324, Q.COMMON, V.ORIG, 150, 170, 185, 200)
 	self:AddRecipeFlags(3859, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(3859, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3859, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Boots of the Enchanter -- 3860
 	AddRecipe(3860, 175, 4325, Q.UNCOMMON, V.ORIG, 175, 195, 210, 225)
 	self:AddRecipeFlags(3860, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3860, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3860, 2)

 	-- Long Silken Cloak -- 3861
 	AddRecipe(3861, 185, 4326, Q.COMMON, V.ORIG, 185, 205, 220, 235)
 	self:AddRecipeFlags(3861, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeTrainer(3861, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(3861, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Icy Cloak -- 3862
 	AddRecipe(3862, 200, 4327, Q.COMMON, V.ORIG, 200, 220, 235, 250)
@@ -268,27 +268,27 @@ function addon:InitTailoring()
 	-- Spider Belt -- 3863
 	AddRecipe(3863, 180, 4328, Q.UNCOMMON, V.ORIG, 180, 200, 215, 230)
 	self:AddRecipeFlags(3863, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(3863, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3863, 2)

 	-- Star Belt -- 3864
 	AddRecipe(3864, 200, 4329, Q.UNCOMMON, V.ORIG, 200, 220, 235, 250)
 	self:AddRecipeFlags(3864, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3864, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3864, 2)

 	-- Bolt of Mageweave -- 3865
 	AddRecipe(3865, 175, 4339, Q.COMMON, V.ORIG, 175, 180, 182, 185)
 	self:AddRecipeFlags(3865, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3865, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(3865, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Stylish Red Shirt -- 3866
 	AddRecipe(3866, 110, 4330, Q.COMMON, V.ORIG, 110, 135, 152, 170)
 	self:AddRecipeFlags(3866, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3866, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(3866, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Phoenix Gloves -- 3868
 	AddRecipe(3868, 125, 4331, Q.UNCOMMON, V.ORIG, 125, 150, 167, 185)
 	self:AddRecipeFlags(3868, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(3868, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3868, 2)

 	-- Bright Yellow Shirt -- 3869
 	AddRecipe(3869, 135, 4332, Q.COMMON, V.ORIG, 135, 145, 150, 155)
@@ -303,12 +303,12 @@ function addon:InitTailoring()
 	-- Formal White Shirt -- 3871
 	AddRecipe(3871, 170, 4334, Q.COMMON, V.ORIG, 170, 180, 185, 190)
 	self:AddRecipeFlags(3871, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(3871, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(3871, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Rich Purple Silk Shirt -- 3872
 	AddRecipe(3872, 185, 4335, Q.RARE, V.ORIG, 185, 195, 200, 205)
 	self:AddRecipeFlags(3872, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(3872, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(3872, 2)

 	-- Black Swashbuckler's Shirt -- 3873
 	AddRecipe(3873, 200, 4336, Q.COMMON, V.ORIG, 200, 210, 215, 220)
@@ -318,7 +318,7 @@ function addon:InitTailoring()
 	-- Brown Linen Pants -- 3914
 	AddRecipe(3914, 30, 4343, Q.COMMON, V.ORIG, 30, 55, 72, 90)
 	self:AddRecipeFlags(3914, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(3914, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(3914, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Brown Linen Shirt -- 3915
 	AddRecipe(3915, 1, 4344, Q.COMMON, V.ORIG, 1, 35, 47, 60)
@@ -328,34 +328,34 @@ function addon:InitTailoring()
 	-- Pearl-clasped Cloak -- 6521
 	AddRecipe(6521, 90, 5542, Q.COMMON, V.ORIG, 90, 115, 132, 150)
 	self:AddRecipeFlags(6521, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOAK)
-	self:AddRecipeTrainer(6521, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(6521, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Red Linen Bag -- 6686
 	AddRecipe(6686, 70, 5762, Q.COMMON, V.ORIG, 70, 95, 112, 130)
 	self:AddRecipeFlags(6686, F.ALLIANCE, F.HORDE, F.VENDOR, F.INSTANCE, F.MOB_DROP, F.IBOE, F.RBOE)
 	self:AddRecipeMobDrop(6686, 3531, 3530, 590)
-	self:AddRecipeVendor(6686, 16224, 843, 3005, 3556, 4189)
+	self:AddRecipeVendor(6686, 16224, 843, 3005, 4189, 3556)

 	-- Red Woolen Bag -- 6688
 	AddRecipe(6688, 115, 5763, Q.COMMON, V.ORIG, 115, 140, 157, 175)
 	self:AddRecipeFlags(6688, F.ALLIANCE, F.HORDE, F.VENDOR, F.INSTANCE, F.MOB_DROP, F.IBOE, F.RBOE)
 	self:AddRecipeMobDrop(6688, 450, 2264)
-	self:AddRecipeVendor(6688, 3683, 1474, 4189, 3364, 3537, 777, 5944, 1454, 4577, 3485, 3005)
+	self:AddRecipeVendor(6688, 3683, 1474, 5944, 3364, 3537, 777, 3005, 1454, 3485, 4577, 4189)

 	-- Lesser Wizard's Robe -- 6690
 	AddRecipe(6690, 135, 5766, Q.COMMON, V.ORIG, 135, 155, 170, 185)
 	self:AddRecipeFlags(6690, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(6690, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(6690, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Robes of Arcana -- 6692
 	AddRecipe(6692, 150, 5770, Q.UNCOMMON, V.ORIG, 150, 170, 185, 200)
 	self:AddRecipeFlags(6692, F.ALLIANCE, F.HORDE, F.MOB_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeMobDrop(6692, 2337, 10760, 910)
+	self:AddRecipeMobDrop(6692, 10760, 910, 2337)

 	-- Green Silk Pack -- 6693
 	AddRecipe(6693, 175, 5764, Q.UNCOMMON, V.ORIG, 175, 195, 210, 225)
 	self:AddRecipeFlags(6693, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(6693, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(6693, 2)

 	-- Black Silk Pack -- 6695
 	AddRecipe(6695, 185, 5765, Q.UNCOMMON, V.ORIG, 185, 205, 220, 235)
@@ -365,17 +365,17 @@ function addon:InitTailoring()
 	-- Brown Linen Robe -- 7623
 	AddRecipe(7623, 30, 6238, Q.COMMON, V.ORIG, 30, 55, 72, 90)
 	self:AddRecipeFlags(7623, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(7623, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(7623, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- White Linen Robe -- 7624
 	AddRecipe(7624, 30, 6241, Q.COMMON, V.ORIG, 30, 55, 72, 90)
 	self:AddRecipeFlags(7624, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(7624, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(7624, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Red Linen Vest -- 7629
 	AddRecipe(7629, 55, 6239, Q.UNCOMMON, V.ORIG, 55, 80, 97, 115)
 	self:AddRecipeFlags(7629, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(7629, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7629, 2)

 	-- Blue Linen Vest -- 7630
 	AddRecipe(7630, 55, 6240, Q.COMMON, V.ORIG, 55, 80, 97, 115)
@@ -385,12 +385,12 @@ function addon:InitTailoring()
 	-- Blue Linen Robe -- 7633
 	AddRecipe(7633, 70, 6242, Q.COMMON, V.ORIG, 70, 95, 112, 130)
 	self:AddRecipeFlags(7633, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeVendor(7633, 4168, 3499, 3556, 1250, 3485)
+	self:AddRecipeVendor(7633, 4168, 3499, 3556, 3485, 1250)

 	-- Blue Overalls -- 7639
 	AddRecipe(7639, 100, 6263, Q.COMMON, V.ORIG, 100, 125, 142, 160)
 	self:AddRecipeFlags(7639, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeVendor(7639, 3364, 843, 5944, 1347, 2394)
+	self:AddRecipeVendor(7639, 5944, 843, 2394, 1347, 3364)

 	-- Greater Adept's Robe -- 7643
 	AddRecipe(7643, 115, 6264, Q.COMMON, V.ORIG, 115, 140, 157, 175)
@@ -400,92 +400,92 @@ function addon:InitTailoring()
 	-- Stylish Blue Shirt -- 7892
 	AddRecipe(7892, 120, 6384, Q.UNCOMMON, V.ORIG, 120, 145, 162, 180)
 	self:AddRecipeFlags(7892, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(7892, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7892, 2)

 	-- Stylish Green Shirt -- 7893
 	AddRecipe(7893, 120, 6385, Q.UNCOMMON, V.ORIG, 120, 145, 162, 180)
 	self:AddRecipeFlags(7893, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(7893, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(7893, 2)

 	-- Simple Dress -- 8465
 	AddRecipe(8465, 40, 6786, Q.COMMON, V.ORIG, 40, 65, 82, 100)
 	self:AddRecipeFlags(8465, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(8465, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(8465, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- White Woolen Dress -- 8467
 	AddRecipe(8467, 110, 6787, Q.COMMON, V.ORIG, 110, 135, 152, 170)
 	self:AddRecipeFlags(8467, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(8467, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(8467, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- White Swashbuckler's Shirt -- 8483
 	AddRecipe(8483, 160, 6795, Q.COMMON, V.ORIG, 160, 170, 175, 180)
 	self:AddRecipeFlags(8483, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(8483, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(8483, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Red Swashbuckler's Shirt -- 8489
 	AddRecipe(8489, 175, 6796, Q.COMMON, V.ORIG, 175, 185, 190, 195)
 	self:AddRecipeFlags(8489, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(8489, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(8489, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Azure Silk Pants -- 8758
 	AddRecipe(8758, 140, 7046, Q.COMMON, V.ORIG, 140, 160, 175, 190)
 	self:AddRecipeFlags(8758, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(8758, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(8758, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Azure Silk Hood -- 8760
 	AddRecipe(8760, 145, 7048, Q.COMMON, V.ORIG, 145, 155, 160, 165)
 	self:AddRecipeFlags(8760, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(8760, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 26969, 18772, 33636, 5153, 33613, 27001, 4576, 1103, 11052, 33580, 3484, 17487, 2627, 11557, 16729, 28699, 1346, 26914, 4159, 3363, 16640, 3704)
+	self:AddRecipeTrainer(8760, 2399, 33684, 26964, 3523, 3704, 16640, 16366, 3004, 3363, 4159, 11052, 26969, 1346, 27001, 33636, 28699, 18772, 16729, 2627, 4193, 33580, 11557, 33613, 17487, 3484, 26914, 1103, 18749, 4576, 5153)

 	-- Silk Headband -- 8762
 	AddRecipe(8762, 160, 7050, Q.COMMON, V.ORIG, 160, 170, 175, 180)
 	self:AddRecipeFlags(8762, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(8762, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(8762, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Earthen Vest -- 8764
 	AddRecipe(8764, 170, 7051, Q.COMMON, V.ORIG, 170, 190, 205, 220)
 	self:AddRecipeFlags(8764, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(8764, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(8764, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Azure Silk Belt -- 8766
 	AddRecipe(8766, 175, 7052, Q.COMMON, V.ORIG, 175, 195, 210, 225)
 	self:AddRecipeFlags(8766, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(8766, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3363, 27001, 4576, 4159, 11052, 33636, 33613, 17487, 33580, 11557, 16729, 28699, 18772, 26914, 1103, 2627, 3704, 3484)
+	self:AddRecipeTrainer(8766, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 1103, 11052, 26969, 18772, 27001, 4576, 28699, 3363, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 33636, 26914, 4159, 18749, 5153, 16640)

 	-- Robe of Power -- 8770
 	AddRecipe(8770, 190, 7054, Q.COMMON, V.ORIG, 190, 210, 225, 240)
 	self:AddRecipeFlags(8770, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOP, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(8770, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3363, 27001, 4576, 4159, 11052, 33636, 33613, 17487, 33580, 11557, 16729, 28699, 18772, 26914, 1103, 2627, 3704, 3484)
+	self:AddRecipeTrainer(8770, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 1103, 11052, 26969, 18772, 27001, 4576, 28699, 3363, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 33636, 26914, 4159, 18749, 5153, 16640)

 	-- Crimson Silk Belt -- 8772
 	AddRecipe(8772, 175, 7055, Q.COMMON, V.ORIG, 175, 195, 210, 225)
 	self:AddRecipeFlags(8772, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(8772, 2399, 33684, 18749, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(8772, 2399, 33684, 18749, 3484, 2627, 16366, 3004, 28699, 4159, 33636, 5153, 18772, 27001, 4576, 3363, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 26969, 26914, 1103, 3704, 16640, 26964)

 	-- Green Silken Shoulders -- 8774
 	AddRecipe(8774, 180, 7057, Q.COMMON, V.ORIG, 180, 200, 215, 230)
 	self:AddRecipeFlags(8774, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(8774, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3363, 27001, 4576, 4159, 11052, 33636, 33613, 17487, 33580, 11557, 16729, 28699, 18772, 26914, 1103, 2627, 3704, 3484)
+	self:AddRecipeTrainer(8774, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 1103, 11052, 26969, 18772, 27001, 4576, 28699, 3363, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 33636, 26914, 4159, 18749, 5153, 16640)

 	-- Linen Belt -- 8776
 	AddRecipe(8776, 15, 7026, Q.COMMON, V.ORIG, 15, 50, 67, 85)
 	self:AddRecipeFlags(8776, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(8776, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(8776, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Hands of Darkness -- 8780
 	AddRecipe(8780, 145, 7047, Q.UNCOMMON, V.ORIG, 145, 165, 180, 195)
 	self:AddRecipeFlags(8780, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(8780, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(8780, 2)

 	-- Truefaith Gloves -- 8782
 	AddRecipe(8782, 150, 7049, Q.UNCOMMON, V.ORIG, 150, 170, 185, 200)
 	self:AddRecipeFlags(8782, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(8782, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(8782, 2)

 	-- Green Silk Armor -- 8784
 	AddRecipe(8784, 165, 7065, Q.UNCOMMON, V.ORIG, 165, 185, 200, 215)
 	self:AddRecipeFlags(8784, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(8784, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(8784, 2)

 	-- Azure Silk Cloak -- 8786
 	AddRecipe(8786, 175, 7053, Q.COMMON, V.ORIG, 175, 195, 210, 225)
@@ -500,27 +500,27 @@ function addon:InitTailoring()
 	-- Crimson Silk Vest -- 8791
 	AddRecipe(8791, 185, 7058, Q.COMMON, V.ORIG, 185, 205, 215, 225)
 	self:AddRecipeFlags(8791, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(8791, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3363, 27001, 4576, 4159, 11052, 33636, 33613, 17487, 33580, 11557, 16729, 28699, 18772, 26914, 1103, 2627, 3704, 3484)
+	self:AddRecipeTrainer(8791, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 1103, 11052, 26969, 18772, 27001, 4576, 28699, 3363, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 33636, 26914, 4159, 18749, 5153, 16640)

 	-- Crimson Silk Shoulders -- 8793
 	AddRecipe(8793, 190, 7059, Q.UNCOMMON, V.ORIG, 190, 210, 225, 240)
 	self:AddRecipeFlags(8793, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(8793, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(8793, 2)

 	-- Azure Shoulders -- 8795
 	AddRecipe(8795, 190, 7060, Q.UNCOMMON, V.ORIG, 190, 210, 225, 240)
 	self:AddRecipeFlags(8795, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(8795, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(8795, 2)

 	-- Earthen Silk Belt -- 8797
 	AddRecipe(8797, 195, 7061, Q.UNCOMMON, V.ORIG, 195, 215, 230, 245)
 	self:AddRecipeFlags(8797, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(8797, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(8797, 2)

 	-- Crimson Silk Pantaloons -- 8799
 	AddRecipe(8799, 195, 7062, Q.COMMON, V.ORIG, 195, 215, 225, 235)
 	self:AddRecipeFlags(8799, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(8799, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(8799, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Crimson Silk Robe -- 8802
 	AddRecipe(8802, 205, 7063, Q.COMMON, V.ORIG, 205, 220, 235, 250)
@@ -530,7 +530,7 @@ function addon:InitTailoring()
 	-- Crimson Silk Gloves -- 8804
 	AddRecipe(8804, 210, 7064, Q.COMMON, V.ORIG, 210, 225, 240, 255)
 	self:AddRecipeFlags(8804, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(8804, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(8804, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Simple Linen Pants -- 12044
 	AddRecipe(12044, 1, 10045, Q.COMMON, V.ORIG, 1, 35, 47, 60)
@@ -540,32 +540,32 @@ function addon:InitTailoring()
 	-- Simple Linen Boots -- 12045
 	AddRecipe(12045, 20, 10046, Q.COMMON, V.ORIG, 20, 50, 67, 85)
 	self:AddRecipeFlags(12045, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(12045, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(12045, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Simple Kilt -- 12046
 	AddRecipe(12046, 75, 10047, Q.COMMON, V.ORIG, 75, 100, 117, 135)
 	self:AddRecipeFlags(12046, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12046, 3484, 33684, 18749, 3523, 26964, 26969, 16366, 3004, 1103, 33636, 33613, 5153, 33580, 27001, 4576, 28699, 11052, 18772, 17487, 4193, 2627, 11557, 16729, 16640, 1346, 26914, 4159, 3363, 3704, 2399)
+	self:AddRecipeTrainer(12046, 3484, 33684, 18749, 3523, 2399, 3704, 16366, 3004, 3363, 4159, 26969, 5153, 1346, 27001, 33636, 16640, 11052, 16729, 2627, 17487, 33580, 11557, 33613, 4193, 18772, 26914, 1103, 4576, 28699, 26964)

 	-- Colorful Kilt -- 12047
 	AddRecipe(12047, 120, 10048, Q.UNCOMMON, V.ORIG, 120, 145, 162, 180)
 	self:AddRecipeFlags(12047, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(12047, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12047, 2)

 	-- Black Mageweave Vest -- 12048
 	AddRecipe(12048, 205, 9998, Q.COMMON, V.ORIG, 205, 220, 235, 250)
 	self:AddRecipeFlags(12048, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12048, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12048, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Black Mageweave Leggings -- 12049
 	AddRecipe(12049, 205, 9999, Q.COMMON, V.ORIG, 205, 220, 235, 250)
 	self:AddRecipeFlags(12049, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12049, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12049, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Black Mageweave Robe -- 12050
 	AddRecipe(12050, 210, 10001, Q.COMMON, V.ORIG, 210, 225, 240, 255)
 	self:AddRecipeFlags(12050, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12050, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12050, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Shadoweave Pants -- 12052
 	AddRecipe(12052, 210, 10002, Q.COMMON, V.ORIG, 210, 225, 240, 255)
@@ -575,7 +575,7 @@ function addon:InitTailoring()
 	-- Black Mageweave Gloves -- 12053
 	AddRecipe(12053, 215, 10003, Q.COMMON, V.ORIG, 215, 230, 245, 260)
 	self:AddRecipeFlags(12053, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12053, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12053, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Shadoweave Robe -- 12055
 	AddRecipe(12055, 215, 10004, Q.COMMON, V.ORIG, 215, 230, 245, 260)
@@ -585,22 +585,22 @@ function addon:InitTailoring()
 	-- Red Mageweave Vest -- 12056
 	AddRecipe(12056, 215, 10007, Q.UNCOMMON, V.ORIG, 215, 230, 245, 260)
 	self:AddRecipeFlags(12056, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(12056, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12056, 2)

 	-- White Bandit Mask -- 12059
 	AddRecipe(12059, 215, 10008, Q.UNCOMMON, V.ORIG, 215, 220, 225, 230)
 	self:AddRecipeFlags(12059, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(12059, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12059, 2)

 	-- Red Mageweave Pants -- 12060
 	AddRecipe(12060, 215, 10009, Q.UNCOMMON, V.ORIG, 215, 230, 245, 260)
 	self:AddRecipeFlags(12060, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(12060, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12060, 2)

 	-- Orange Mageweave Shirt -- 12061
 	AddRecipe(12061, 215, 10056, Q.COMMON, V.ORIG, 215, 220, 225, 230)
 	self:AddRecipeFlags(12061, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12061, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12061, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Orange Martial Shirt -- 12064
 	AddRecipe(12064, 220, 10052, Q.COMMON, V.ORIG, 220, 225, 230, 235)
@@ -610,27 +610,27 @@ function addon:InitTailoring()
 	-- Mageweave Bag -- 12065
 	AddRecipe(12065, 225, 10050, Q.COMMON, V.ORIG, 225, 240, 255, 270)
 	self:AddRecipeFlags(12065, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12065, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12065, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Red Mageweave Gloves -- 12066
 	AddRecipe(12066, 225, 10018, Q.UNCOMMON, V.ORIG, 225, 240, 255, 270)
 	self:AddRecipeFlags(12066, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(12066, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12066, 2)

 	-- Dreamweave Gloves -- 12067
 	AddRecipe(12067, 225, 10019, Q.COMMON, V.ORIG, 225, 240, 255, 270)
 	self:AddRecipeFlags(12067, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12067, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12067, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Cindercloth Robe -- 12069
 	AddRecipe(12069, 225, 10042, Q.COMMON, V.ORIG, 225, 240, 255, 270)
 	self:AddRecipeFlags(12069, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12069, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12069, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Dreamweave Vest -- 12070
 	AddRecipe(12070, 225, 10021, Q.COMMON, V.ORIG, 225, 240, 255, 270)
 	self:AddRecipeFlags(12070, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12070, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1346, 16640, 26969, 3704, 27001, 4576, 33636, 11052, 33613, 1103, 17487, 33580, 11557, 16729, 3363, 18772, 26914, 4159, 28699, 2627, 3484)
+	self:AddRecipeTrainer(12070, 2399, 33684, 26964, 3523, 3484, 2627, 16366, 3004, 28699, 4159, 11052, 26969, 18772, 27001, 4576, 3363, 3704, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 33636, 5153, 16640)

 	-- Shadoweave Gloves -- 12071
 	AddRecipe(12071, 225, 10023, Q.COMMON, V.ORIG, 225, 240, 255, 270)
@@ -640,17 +640,17 @@ function addon:InitTailoring()
 	-- Black Mageweave Headband -- 12072
 	AddRecipe(12072, 230, 10024, Q.COMMON, V.ORIG, 230, 245, 260, 275)
 	self:AddRecipeFlags(12072, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12072, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1103, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 17487, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(12072, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 4159, 18749, 5153, 3363, 27001, 4576, 18772, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 26969, 26914, 1103, 33636, 28699, 16640)

 	-- Black Mageweave Boots -- 12073
 	AddRecipe(12073, 230, 10026, Q.COMMON, V.ORIG, 230, 245, 260, 275)
 	self:AddRecipeFlags(12073, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12073, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1103, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 17487, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(12073, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 4159, 18749, 5153, 3363, 27001, 4576, 18772, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 26969, 26914, 1103, 33636, 28699, 16640)

 	-- Black Mageweave Shoulders -- 12074
 	AddRecipe(12074, 230, 10027, Q.COMMON, V.ORIG, 230, 245, 260, 275)
 	self:AddRecipeFlags(12074, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12074, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1103, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 17487, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(12074, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 4159, 18749, 5153, 3363, 27001, 4576, 18772, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 26969, 26914, 1103, 33636, 28699, 16640)

 	-- Lavender Mageweave Shirt -- 12075
 	AddRecipe(12075, 230, 10054, Q.COMMON, V.ORIG, 230, 235, 240, 245)
@@ -665,17 +665,17 @@ function addon:InitTailoring()
 	-- Simple Black Dress -- 12077
 	AddRecipe(12077, 235, 10053, Q.COMMON, V.ORIG, 235, 240, 245, 250)
 	self:AddRecipeFlags(12077, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12077, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1103, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 17487, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(12077, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 4159, 18749, 5153, 3363, 27001, 4576, 18772, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 26969, 26914, 1103, 33636, 28699, 16640)

 	-- Red Mageweave Shoulders -- 12078
 	AddRecipe(12078, 235, 10029, Q.UNCOMMON, V.ORIG, 235, 250, 265, 280)
 	self:AddRecipeFlags(12078, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(12078, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12078, 2)

 	-- Red Mageweave Bag -- 12079
 	AddRecipe(12079, 235, 10051, Q.COMMON, V.ORIG, 235, 250, 265, 280)
 	self:AddRecipeFlags(12079, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(12079, 2399, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1103, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 17487, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(12079, 2399, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 4159, 4576, 26969, 3363, 27001, 33636, 18772, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 18749, 26914, 1103, 5153, 28699, 16640)

 	-- Pink Mageweave Shirt -- 12080
 	AddRecipe(12080, 235, 10055, Q.COMMON, V.ORIG, 235, 240, 245, 250)
@@ -695,7 +695,7 @@ function addon:InitTailoring()
 	-- Red Mageweave Headband -- 12084
 	AddRecipe(12084, 240, 10033, Q.UNCOMMON, V.ORIG, 240, 255, 270, 285)
 	self:AddRecipeFlags(12084, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(12084, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(12084, 2)

 	-- Tuxedo Shirt -- 12085
 	AddRecipe(12085, 240, 10034, Q.COMMON, V.ORIG, 240, 245, 250, 255)
@@ -705,12 +705,12 @@ function addon:InitTailoring()
 	-- Shadoweave Mask -- 12086
 	AddRecipe(12086, 245, 10025, Q.UNCOMMON, V.ORIG, 245, 260, 275, 290)
 	self:AddRecipeFlags(12086, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(12086, A.QUEST, 3402)
+	self:AddRecipeQuest(12086, 3402)

 	-- Cindercloth Boots -- 12088
 	AddRecipe(12088, 245, 10044, Q.COMMON, V.ORIG, 245, 260, 275, 290)
 	self:AddRecipeFlags(12088, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12088, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1103, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 17487, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(12088, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 4159, 18749, 5153, 3363, 27001, 4576, 18772, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 26969, 26914, 1103, 33636, 28699, 16640)

 	-- Tuxedo Pants -- 12089
 	AddRecipe(12089, 245, 10035, Q.COMMON, V.ORIG, 245, 250, 255, 260)
@@ -725,7 +725,7 @@ function addon:InitTailoring()
 	-- Dreamweave Circlet -- 12092
 	AddRecipe(12092, 250, 10041, Q.COMMON, V.ORIG, 250, 265, 280, 295)
 	self:AddRecipeFlags(12092, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(12092, 2399, 33684, 18749, 3523, 26964, 16366, 3004, 1103, 5153, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 4193, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(12092, 2399, 33684, 26964, 3523, 3484, 16366, 3004, 3704, 2627, 4159, 5153, 4576, 27001, 33636, 3363, 11052, 18772, 16729, 4193, 33580, 1346, 33613, 11557, 18749, 26914, 1103, 26969, 28699, 16640)

 	-- Tuxedo Jacket -- 12093
 	AddRecipe(12093, 250, 10036, Q.COMMON, V.ORIG, 250, 265, 280, 295)
@@ -735,22 +735,22 @@ function addon:InitTailoring()
 	-- Bolt of Runecloth -- 18401
 	AddRecipe(18401, 250, 14048, Q.COMMON, V.ORIG, 250, 255, 257, 260)
 	self:AddRecipeFlags(18401, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.CLOTH)
-	self:AddRecipeTrainer(18401, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1103, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 17487, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(18401, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 4159, 18749, 5153, 3363, 27001, 4576, 18772, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 26969, 26914, 1103, 33636, 28699, 16640)

 	-- Runecloth Belt -- 18402
 	AddRecipe(18402, 255, 13856, Q.COMMON, V.ORIG, 255, 270, 285, 300)
 	self:AddRecipeFlags(18402, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18402, 2399, 33684, 18749, 3523, 26964, 4193, 16366, 3004, 5153, 1103, 16640, 26969, 4576, 27001, 33636, 28699, 11052, 33613, 1346, 17487, 33580, 11557, 16729, 18772, 3363, 26914, 4159, 2627, 3704, 3484)
+	self:AddRecipeTrainer(18402, 2399, 33684, 26964, 3523, 3484, 3704, 16366, 3004, 2627, 4159, 18749, 5153, 3363, 27001, 4576, 18772, 11052, 16729, 11557, 4193, 33580, 1346, 33613, 17487, 26969, 26914, 1103, 33636, 28699, 16640)

 	-- Frostweave Tunic -- 18403
 	AddRecipe(18403, 255, 13869, Q.UNCOMMON, V.ORIG, 255, 270, 285, 300)
 	self:AddRecipeFlags(18403, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18403, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18403, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Frostweave Robe -- 18404
 	AddRecipe(18404, 255, 13868, Q.UNCOMMON, V.ORIG, 255, 270, 285, 300)
 	self:AddRecipeFlags(18404, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(18404, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18404, 2)

 	-- Runecloth Bag -- 18405
 	AddRecipe(18405, 260, 14046, Q.COMMON, V.ORIG, 260, 275, 290, 305)
@@ -760,13 +760,13 @@ function addon:InitTailoring()
 	-- Runecloth Robe -- 18406
 	AddRecipe(18406, 260, 13858, Q.COMMON, V.ORIG, 260, 275, 290, 305)
 	self:AddRecipeFlags(18406, F.ALLIANCE, F.HORDE, F.TRAINER, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18406, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18406, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)
 	self:AddRecipeVendor(18406, 7940)

 	-- Runecloth Tunic -- 18407
 	AddRecipe(18407, 260, 13857, Q.UNCOMMON, V.ORIG, 260, 275, 290, 305)
 	self:AddRecipeFlags(18407, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18407, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18407, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Cindercloth Vest -- 18408
 	AddRecipe(18408, 260, 14042, Q.UNCOMMON, V.ORIG, 260, 275, 290, 305)
@@ -776,18 +776,18 @@ function addon:InitTailoring()
 	-- Runecloth Cloak -- 18409
 	AddRecipe(18409, 265, 13860, Q.COMMON, V.ORIG, 265, 280, 295, 310)
 	self:AddRecipeFlags(18409, F.ALLIANCE, F.HORDE, F.TRAINER, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeTrainer(18409, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18409, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)
 	self:AddRecipeVendor(18409, 7940)

 	-- Ghostweave Belt -- 18410
 	AddRecipe(18410, 265, 14143, Q.UNCOMMON, V.ORIG, 265, 280, 295, 310)
 	self:AddRecipeFlags(18410, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18410, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18410, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Frostweave Gloves -- 18411
 	AddRecipe(18411, 265, 13870, Q.UNCOMMON, V.ORIG, 265, 280, 295, 310)
 	self:AddRecipeFlags(18411, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18411, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18411, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Cindercloth Gloves -- 18412
 	AddRecipe(18412, 270, 14043, Q.UNCOMMON, V.ORIG, 270, 285, 300, 315)
@@ -797,27 +797,27 @@ function addon:InitTailoring()
 	-- Ghostweave Gloves -- 18413
 	AddRecipe(18413, 270, 14142, Q.UNCOMMON, V.ORIG, 270, 285, 300, 315)
 	self:AddRecipeFlags(18413, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18413, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18413, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Brightcloth Robe -- 18414
 	AddRecipe(18414, 270, 14100, Q.UNCOMMON, V.ORIG, 270, 285, 300, 315)
 	self:AddRecipeFlags(18414, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18414, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18414, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Brightcloth Gloves -- 18415
 	AddRecipe(18415, 270, 14101, Q.UNCOMMON, V.ORIG, 270, 285, 300, 315)
 	self:AddRecipeFlags(18415, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18415, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18415, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Ghostweave Vest -- 18416
 	AddRecipe(18416, 275, 14141, Q.UNCOMMON, V.ORIG, 275, 290, 305, 320)
 	self:AddRecipeFlags(18416, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18416, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18416, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Runecloth Gloves -- 18417
 	AddRecipe(18417, 275, 13863, Q.COMMON, V.ORIG, 275, 290, 305, 320)
 	self:AddRecipeFlags(18417, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18417, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18417, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Cindercloth Cloak -- 18418
 	AddRecipe(18418, 275, 14044, Q.UNCOMMON, V.ORIG, 275, 290, 305, 320)
@@ -832,12 +832,12 @@ function addon:InitTailoring()
 	-- Brightcloth Cloak -- 18420
 	AddRecipe(18420, 275, 14103, Q.UNCOMMON, V.ORIG, 275, 290, 305, 320)
 	self:AddRecipeFlags(18420, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeTrainer(18420, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18420, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Wizardweave Leggings -- 18421
 	AddRecipe(18421, 275, 14132, Q.UNCOMMON, V.ORIG, 275, 290, 305, 320)
 	self:AddRecipeFlags(18421, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18421, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18421, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Cloak of Fire -- 18422
 	AddRecipe(18422, 275, 14134, Q.RARE, V.ORIG, 275, 290, 305, 320)
@@ -847,13 +847,13 @@ function addon:InitTailoring()
 	-- Runecloth Boots -- 18423
 	AddRecipe(18423, 280, 13864, Q.COMMON, V.ORIG, 280, 295, 310, 325)
 	self:AddRecipeFlags(18423, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18423, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18423, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Frostweave Pants -- 18424
 	AddRecipe(18424, 280, 13871, Q.UNCOMMON, V.ORIG, 280, 295, 310, 325)
 	self:AddRecipeFlags(18424, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18424, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
-	self:AddRecipeAcquire(18424, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(18424, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)
+	self:AddRecipeWorldDrop(18424, 2)

 	-- Cindercloth Pants -- 18434
 	AddRecipe(18434, 280, 14045, Q.UNCOMMON, V.ORIG, 280, 295, 310, 325)
@@ -868,96 +868,96 @@ function addon:InitTailoring()
 	-- Felcloth Boots -- 18437
 	AddRecipe(18437, 285, 14108, Q.UNCOMMON, V.ORIG, 285, 300, 315, 330)
 	self:AddRecipeFlags(18437, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18437, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18437, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Runecloth Pants -- 18438
 	AddRecipe(18438, 285, 13865, Q.UNCOMMON, V.ORIG, 285, 300, 315, 330)
 	self:AddRecipeFlags(18438, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18438, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
-	self:AddRecipeAcquire(18438, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(18438, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)
+	self:AddRecipeWorldDrop(18438, 2)

 	-- Brightcloth Pants -- 18439
 	AddRecipe(18439, 290, 14104, Q.UNCOMMON, V.ORIG, 290, 305, 320, 335)
 	self:AddRecipeFlags(18439, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(18439, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18439, 2)

 	-- Mooncloth Leggings -- 18440
 	AddRecipe(18440, 290, 14137, Q.RARE, V.ORIG, 290, 305, 320, 335)
 	self:AddRecipeFlags(18440, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(18440, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18440, 2)

 	-- Ghostweave Pants -- 18441
 	AddRecipe(18441, 290, 14144, Q.UNCOMMON, V.ORIG, 290, 305, 320, 335)
 	self:AddRecipeFlags(18441, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18441, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18441, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Felcloth Hood -- 18442
 	AddRecipe(18442, 290, 14111, Q.UNCOMMON, V.ORIG, 290, 305, 320, 335)
 	self:AddRecipeFlags(18442, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18442, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18442, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Runecloth Headband -- 18444
 	AddRecipe(18444, 295, 13866, Q.UNCOMMON, V.ORIG, 295, 310, 325, 340)
 	self:AddRecipeFlags(18444, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18444, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18444, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Mooncloth Bag -- 18445
 	AddRecipe(18445, 300, 14155, Q.UNCOMMON, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18445, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(18445, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18445, 2)

 	-- Wizardweave Robe -- 18446
 	AddRecipe(18446, 300, 14128, Q.UNCOMMON, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18446, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18446, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18446, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Mooncloth Vest -- 18447
 	AddRecipe(18447, 300, 14138, Q.RARE, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18447, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(18447, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18447, 2)

 	-- Mooncloth Shoulders -- 18448
 	AddRecipe(18448, 300, 14139, Q.RARE, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18448, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(18448, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18448, 2)

 	-- Runecloth Shoulders -- 18449
 	AddRecipe(18449, 300, 13867, Q.UNCOMMON, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18449, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18449, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
-	self:AddRecipeAcquire(18449, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(18449, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)
+	self:AddRecipeWorldDrop(18449, 2)

 	-- Wizardweave Turban -- 18450
 	AddRecipe(18450, 300, 14130, Q.UNCOMMON, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18450, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeTrainer(18450, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
+	self:AddRecipeTrainer(18450, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)

 	-- Felcloth Robe -- 18451
 	AddRecipe(18451, 300, 14106, Q.UNCOMMON, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18451, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18451, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
-	self:AddRecipeAcquire(18451, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(18451, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)
+	self:AddRecipeWorldDrop(18451, 2)

 	-- Mooncloth Circlet -- 18452
 	AddRecipe(18452, 300, 14140, Q.RARE, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18452, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(18452, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18452, 2)

 	-- Felcloth Shoulders -- 18453
 	AddRecipe(18453, 300, 14112, Q.UNCOMMON, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18453, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(18453, 28699, 33684, 18749, 3523, 11557, 26964, 16366, 3004, 4193, 5153, 16640, 26969, 18772, 27001, 33636, 4576, 11052, 3363, 33613, 17487, 2627, 1346, 16729, 4159, 33580, 26914, 1103, 3704, 3484, 2399)
-	self:AddRecipeAcquire(18453, A.WORLD_DROP, 2)
+	self:AddRecipeTrainer(18453, 16640, 33684, 26964, 3523, 2399, 3484, 16366, 3004, 3704, 1103, 11052, 5153, 33580, 27001, 33636, 4576, 18772, 16729, 1346, 4193, 2627, 11557, 33613, 17487, 3363, 26914, 4159, 18749, 26969, 28699)
+	self:AddRecipeWorldDrop(18453, 2)

 	-- Gloves of Spell Mastery -- 18454
 	AddRecipe(18454, 300, 14146, Q.EPIC, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18454, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.MAGE, F.PRIEST, F.WARLOCK, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(18454, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18454, 2)

 	-- Bottomless Bag -- 18455
 	AddRecipe(18455, 300, 14156, Q.RARE, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(18455, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(18455, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(18455, 2)

 	-- Truefaith Vestments -- 18456
 	AddRecipe(18456, 300, 14154, Q.EPIC, V.ORIG, 300, 315, 330, 345)
@@ -982,7 +982,7 @@ function addon:InitTailoring()
 	-- Mooncloth Boots -- 19435
 	AddRecipe(19435, 290, 15802, Q.RARE, V.ORIG, 290, 295, 310, 325)
 	self:AddRecipeFlags(19435, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(19435, A.QUEST, 6032)
+	self:AddRecipeQuest(19435, 6032)

 	-- Flarecore Mantle -- 20848
 	AddRecipe(20848, 300, 16980, Q.COMMON, V.ORIG, 300, 315, 330, 345)
@@ -1007,7 +1007,7 @@ function addon:InitTailoring()
 	-- Gordok Ogre Suit -- 22813
 	AddRecipe(22813, 275, 18258, Q.UNCOMMON, V.ORIG, 275, 285, 290, 295)
 	self:AddRecipeFlags(22813, F.ALLIANCE, F.HORDE, F.INSTANCE, F.QUEST, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(22813, A.QUEST, 5518)
+	self:AddRecipeQuest(22813, 5518)

 	-- Belt of the Archmage -- 22866
 	AddRecipe(22866, 300, 18405, Q.EPIC, V.ORIG, 300, 315, 330, 345)
@@ -1087,17 +1087,17 @@ function addon:InitTailoring()
 	-- Runed Stygian Leggings -- 24901
 	AddRecipe(24901, 300, 20538, Q.RARE, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(24901, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(24901, A.QUEST, 8323)
+	self:AddRecipeQuest(24901, 8323)

 	-- Runed Stygian Belt -- 24902
 	AddRecipe(24902, 300, 20539, Q.RARE, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(24902, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(24902, A.QUEST, 8323)
+	self:AddRecipeQuest(24902, 8323)

 	-- Runed Stygian Boots -- 24903
 	AddRecipe(24903, 300, 20537, Q.RARE, V.ORIG, 300, 315, 330, 345)
 	self:AddRecipeFlags(24903, F.ALLIANCE, F.HORDE, F.QUEST, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeAcquire(24903, A.QUEST, 8323)
+	self:AddRecipeQuest(24903, 8323)

 	-- Soul Pouch -- 26085
 	AddRecipe(26085, 260, 21340, Q.COMMON, V.ORIG, 260, 275, 290, 305)
@@ -1130,12 +1130,12 @@ function addon:InitTailoring()
 	-- Bolt of Netherweave -- 26745
 	AddRecipe(26745, 300, 21840, Q.COMMON, V.TBC, 300, 305, 315, 325)
 	self:AddRecipeFlags(26745, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(26745, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 26969, 28699, 33636, 27001)
+	self:AddRecipeTrainer(26745, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 27001, 33636, 28699, 26969)

 	-- Netherweave Bag -- 26746
 	AddRecipe(26746, 315, 21841, Q.COMMON, V.TBC, 315, 320, 330, 340)
 	self:AddRecipeFlags(26746, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(26746, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 26969, 28699, 33636, 27001)
+	self:AddRecipeTrainer(26746, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 27001, 33636, 28699, 26969)

 	-- Bolt of Imbued Netherweave -- 26747
 	AddRecipe(26747, 325, 21842, Q.COMMON, V.TBC, 325, 330, 335, 340)
@@ -1150,7 +1150,7 @@ function addon:InitTailoring()
 	-- Bolt of Soulcloth -- 26750
 	AddRecipe(26750, 345, 21844, Q.COMMON, V.TBC, 345, 345, 350, 355)
 	self:AddRecipeFlags(26750, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.CLOTH)
-	self:AddRecipeVendor(26750, 19015, 19017, 16767, 16638)
+	self:AddRecipeVendor(26750, 19015, 16638, 19017, 16767)

 	-- Primal Mooncloth -- 26751
 	AddRecipe(26751, 350, 21845, Q.COMMON, V.TBC, 350, 350, 355, 360)
@@ -1222,27 +1222,27 @@ function addon:InitTailoring()
 	-- Netherweave Bracers -- 26764
 	AddRecipe(26764, 310, 21849, Q.COMMON, V.TBC, 310, 320, 325, 330)
 	self:AddRecipeFlags(26764, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(26764, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 26969, 28699, 33636, 27001)
+	self:AddRecipeTrainer(26764, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 27001, 33636, 28699, 26969)

 	-- Netherweave Belt -- 26765
 	AddRecipe(26765, 310, 21850, Q.COMMON, V.TBC, 310, 320, 325, 330)
 	self:AddRecipeFlags(26765, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(26765, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 26969, 28699, 33636, 27001)
+	self:AddRecipeTrainer(26765, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 27001, 33636, 28699, 26969)

 	-- Netherweave Gloves -- 26770
 	AddRecipe(26770, 320, 21851, Q.COMMON, V.TBC, 320, 330, 335, 340)
 	self:AddRecipeFlags(26770, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(26770, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 26969, 28699, 33636, 27001)
+	self:AddRecipeTrainer(26770, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 27001, 33636, 28699, 26969)

 	-- Netherweave Pants -- 26771
 	AddRecipe(26771, 325, 21852, Q.COMMON, V.TBC, 325, 335, 340, 345)
 	self:AddRecipeFlags(26771, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(26771, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 26969, 28699, 33636, 27001)
+	self:AddRecipeTrainer(26771, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 27001, 33636, 28699, 26969)

 	-- Netherweave Boots -- 26772
 	AddRecipe(26772, 335, 21853, Q.COMMON, V.TBC, 335, 345, 350, 355)
 	self:AddRecipeFlags(26772, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeTrainer(26772, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 26969, 28699, 33636, 27001)
+	self:AddRecipeTrainer(26772, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 27001, 33636, 28699, 26969)

 	-- Netherweave Robe -- 26773
 	AddRecipe(26773, 340, 21854, Q.COMMON, V.TBC, 340, 350, 355, 360)
@@ -1307,7 +1307,7 @@ function addon:InitTailoring()
 	-- Enchanted Mageweave Pouch -- 27658
 	AddRecipe(27658, 225, 22246, Q.COMMON, V.TBC, 225, 240, 255, 270)
 	self:AddRecipeFlags(27658, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE)
-	self:AddRecipeVendor(27658, 28714, 15419, 4617, 18951, 5757, 16722, 18753, 19234, 3012, 5758, 26569, 18773, 27147, 5158, 19540, 27030, 3346, 1318, 19663, 27054, 19537, 16635, 4228)
+	self:AddRecipeVendor(27658, 28714, 15419, 4617, 18951, 5757, 16722, 27030, 19234, 3012, 5758, 26569, 18773, 4228, 5158, 16635, 19663, 3346, 1318, 27054, 27147, 19537, 18753, 19540)

 	-- Enchanted Runecloth Bag -- 27659
 	AddRecipe(27659, 275, 22248, Q.COMMON, V.ORIG, 275, 290, 305, 320)
@@ -1406,27 +1406,27 @@ function addon:InitTailoring()
 	-- Bracers of Havok -- 31435
 	AddRecipe(31435, 350, 24250, Q.RARE, V.TBC, 350, 360, 365, 370)
 	self:AddRecipeFlags(31435, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(31435, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31435, 3)

 	-- Blackstrike Bracers -- 31437
 	AddRecipe(31437, 350, 24251, Q.RARE, V.TBC, 350, 360, 365, 370)
 	self:AddRecipeFlags(31437, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(31437, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31437, 3)

 	-- Cloak of the Black Void -- 31438
 	AddRecipe(31438, 350, 24252, Q.RARE, V.TBC, 350, 360, 365, 370)
 	self:AddRecipeFlags(31438, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeAcquire(31438, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31438, 3)

 	-- Cloak of Eternity -- 31440
 	AddRecipe(31440, 350, 24253, Q.RARE, V.TBC, 350, 360, 365, 370)
 	self:AddRecipeFlags(31440, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.CLOAK)
-	self:AddRecipeAcquire(31440, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31440, 3)

 	-- White Remedy Cape -- 31441
 	AddRecipe(31441, 350, 24254, Q.RARE, V.TBC, 350, 360, 365, 370)
 	self:AddRecipeFlags(31441, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeAcquire(31441, A.WORLD_DROP, 3)
+	self:AddRecipeWorldDrop(31441, 3)

 	-- Unyielding Girdle -- 31442
 	AddRecipe(31442, 365, 24255, Q.EPIC, V.TBC, 365, 375, 380, 385)
@@ -1436,27 +1436,27 @@ function addon:InitTailoring()
 	-- Girdle of Ruination -- 31443
 	AddRecipe(31443, 365, 24256, Q.EPIC, V.TBC, 365, 375, 380, 385)
 	self:AddRecipeFlags(31443, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(31443, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(31443, 4)

 	-- Black Belt of Knowledge -- 31444
 	AddRecipe(31444, 365, 24257, Q.EPIC, V.TBC, 365, 375, 380, 385)
 	self:AddRecipeFlags(31444, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(31444, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(31444, 4)

 	-- Resolute Cape -- 31448
 	AddRecipe(31448, 365, 24258, Q.EPIC, V.TBC, 365, 375, 380, 385)
 	self:AddRecipeFlags(31448, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.CLOAK)
-	self:AddRecipeAcquire(31448, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(31448, 4)

 	-- Vengeance Wrap -- 31449
 	AddRecipe(31449, 365, 24259, Q.EPIC, V.TBC, 365, 375, 380, 385)
 	self:AddRecipeFlags(31449, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.CLOAK)
-	self:AddRecipeAcquire(31449, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(31449, 4)

 	-- Manaweave Cloak -- 31450
 	AddRecipe(31450, 365, 24260, Q.EPIC, V.TBC, 365, 375, 380, 385)
 	self:AddRecipeFlags(31450, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeAcquire(31450, A.WORLD_DROP, 4)
+	self:AddRecipeWorldDrop(31450, 4)

 	-- Whitemend Pants -- 31451
 	AddRecipe(31451, 375, 24261, Q.EPIC, V.TBC, 375, 385, 390, 395)
@@ -1496,7 +1496,7 @@ function addon:InitTailoring()
 	-- Netherweave Net -- 31460
 	AddRecipe(31460, 300, 24268, Q.COMMON, V.TBC, 300, 300, 310, 320)
 	self:AddRecipeFlags(31460, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
-	self:AddRecipeTrainer(31460, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 26969, 28699, 33636, 27001)
+	self:AddRecipeTrainer(31460, 33613, 18749, 18772, 26914, 33684, 33580, 26964, 27001, 33636, 28699, 26969)

 	-- Belt of Blasting -- 36315
 	AddRecipe(36315, 375, 30038, Q.EPIC, V.TBC, 375, 385, 390, 395)
@@ -1773,12 +1773,12 @@ function addon:InitTailoring()
 	-- Red Lumberjack Shirt -- 55993
 	AddRecipe(55993, 400, 41248, Q.UNCOMMON, V.WOTLK, 400, 400, 405, 410)
 	self:AddRecipeFlags(55993, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(55993, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(55993, 2)

 	-- Blue Lumberjack Shirt -- 55994
 	AddRecipe(55994, 400, 41249, Q.UNCOMMON, V.WOTLK, 400, 400, 405, 410)
 	self:AddRecipeFlags(55994, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(55994, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(55994, 2)

 	-- Yellow Lumberjack Shirt -- 55995
 	AddRecipe(55995, 400, 41251, Q.COMMON, V.WOTLK, 400, 400, 405, 410)
@@ -1788,22 +1788,22 @@ function addon:InitTailoring()
 	-- Green Lumberjack Shirt -- 55996
 	AddRecipe(55996, 400, 41250, Q.UNCOMMON, V.WOTLK, 400, 400, 405, 410)
 	self:AddRecipeFlags(55996, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(55996, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(55996, 2)

 	-- Red Workman's Shirt -- 55997
 	AddRecipe(55997, 400, 41252, Q.UNCOMMON, V.WOTLK, 400, 400, 405, 410)
 	self:AddRecipeFlags(55997, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(55997, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(55997, 2)

 	-- Blue Workman's Shirt -- 55998
 	AddRecipe(55998, 400, 41253, Q.UNCOMMON, V.WOTLK, 400, 400, 405, 410)
 	self:AddRecipeFlags(55998, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(55998, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(55998, 2)

 	-- Rustic Workman's Shirt -- 55999
 	AddRecipe(55999, 400, 41254, Q.UNCOMMON, V.WOTLK, 400, 400, 405, 410)
 	self:AddRecipeFlags(55999, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(55999, A.WORLD_DROP, 2)
+	self:AddRecipeWorldDrop(55999, 2)

 	-- Green Workman's Shirt -- 56000
 	AddRecipe(56000, 400, 41255, Q.COMMON, V.WOTLK, 400, 400, 405, 410)
@@ -2055,7 +2055,7 @@ function addon:InitTailoring()
 	-- Spidersilk Drape -- 63742
 	AddRecipe(63742, 125, 45626, Q.COMMON, V.WOTLK, 125, 150, 167, 185)
 	self:AddRecipeFlags(63742, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeTrainer(63742, 3484, 33684, 26964, 3523, 11557, 16366, 3004, 4193, 5153, 16640, 26969, 11052, 27001, 33636, 4576, 3704, 2399, 18772, 17487, 2627, 1346, 16729, 33613, 1103, 26914, 4159, 3363, 28699, 33580)
+	self:AddRecipeTrainer(63742, 16640, 33684, 26964, 3523, 33580, 16366, 3004, 28699, 3363, 4159, 5153, 2399, 27001, 33636, 4576, 11052, 33613, 1346, 4193, 2627, 11557, 16729, 17487, 18772, 26914, 1103, 26969, 3484, 3704)

 	-- Emerald Bag -- 63924
 	AddRecipe(63924, 435, 45773, Q.COMMON, V.WOTLK, 435, 440, 445, 450)