From b444101c955bfff5ccf8f5d0a4bc6580e62b0abe Mon Sep 17 00:00:00 2001
From: Ackis <Ackis@dummy.example.com>
Date: Mon, 15 Dec 2008 23:04:51 +0000
Subject: [PATCH] Add trainers into dataminer for bs, lw, tailoring,
 enchanting, etc

---
 ARLDataminer.rb             |  369 +++++++++++++++++++++++++++----------------
 RecipeBS.txt                |  130 ---------------
 RecipeDB/ARL-Alchemy.lua    |   32 ++--
 RecipeDB/ARL-Blacksmith.lua |   20 +--
 RecipeDB/ARL-Cook.lua       |   98 ++++++------
 RecipeDB/ARL-Enchant.lua    |  186 +++++++++++-----------
 RecipeDB/ARL-Engineer.lua   |   20 +--
 7 files changed, 408 insertions(+), 447 deletions(-)
 delete mode 100644 RecipeBS.txt

diff --git a/ARLDataminer.rb b/ARLDataminer.rb
index a4dcf16..51ed0dc 100644
--- a/ARLDataminer.rb
+++ b/ARLDataminer.rb
@@ -435,6 +435,16 @@ def parse_quest_data(quest,acquirelisting,flaglisting,npcfactions,maps)
 
 end
 
+def add_npc_trainer(npcid,npcname,npcfac,npcfactions,acquirelisting)
+
+	$trainers[npcid] = {:name => npcname}
+	$trainers[npcid][:faction] = npcfactions[npcfac]
+	acquire = {"type" => acquirelisting["Trainer"],
+				"id" => npcid}
+	return acquire
+
+end
+
 # Creates a database file for the specific recipe
 # TODO: Optimize the code for this function
 
@@ -973,6 +983,16 @@ EOF
 				$trainers[26951] = {:name => "Wilhelmina Renel"}
 				$trainers[26951][:faction] = npcfactions["Horde"]
 				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
+			when "GrandMasterBSTrainer"
+				acquire << add_npc_trainer(28694, "Alard Schmied", "Neutral", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26988, "Argo Strongstout", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26564, "Borus Ironbender", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(29924, "Brandig", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26981, "Crog Steelspine", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(27034, "Josric Fame", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26952, "Kristen Smythe", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26904, "Rosina Rivet", "Alliance", npcfactions, acquirelisting)
+				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
 			when "GrandMasterCookTrainer"
 				acquire << {"type" => acquirelisting["Trainer"],
 							"id" => 29631}
@@ -999,119 +1019,73 @@ EOF
 				$trainers[26953] = {:name => "Thomas Kolichio"}
 				$trainers[26953][:faction] = npcfactions["Horde"]
 				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
+			when "GrandMasterEnchTrainer"
+				acquire << add_npc_trainer(26990, "Alexis Marlowe", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26906, "Elizabeth Jackson", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26954, "Emil Autumn", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(28693, "Enchanter Nalthanis", "Neutral", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26980, "Eorain Dawnstrike", "Horde", npcfactions, acquirelisting)
+				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
+			when "GrandMasterEngTrainer"
+				acquire << add_npc_trainer(25277, "Chief Engineer Leveny", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26955, "Jamesina Watterly", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(28697, "Juston Oshenko", "Neutral", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26991, "Scoks Brightbolt", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26907, "Tisha Longbridge", "Alliance", npcfactions, acquirelisting)
+				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
 			when "InscTrainer"
-				$trainers[26977] = {:name => "Adelene Sunlance"}
-				$trainers[26977][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26977}
-				$trainers[26959] = {:name => "Booker Kells"}
-				$trainers[26959][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26959}
-				$trainers[30713] = {:name => "Catarina Stanford"}
-				$trainers[30713][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30713}
-				$trainers[30717] = {:name => "Elise Brightletter"}
-				$trainers[30717][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30717}
-				$trainers[30715] = {:name => "Feyden Darkin"}
-				$trainers[30715][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30715}
-				$trainers[30706] = {:name => "Jo'mah"}
-				$trainers[30706][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30706}
-				$trainers[30711] = {:name => "Margaux Parchley"}
-				$trainers[30711][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30711}
-				$trainers[30721] = {:name => "Michael Schwan"}
-				$trainers[30721][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30721}
-				$trainers[26916] = {:name => "Mindri Dinkles"}
-				$trainers[26916][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26916}
-				$trainers[30722] = {:name => "Neferatti"}
-				$trainers[30722][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30722}
-				$trainers[30709] = {:name => "Poshken Hardbinder"}
-				$trainers[30709][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30709}
-				$trainers[28702] = {:name => "Professor Pallin"}
-				$trainers[28702][:faction] = npcfactions["Neutral"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 28702}
-				$trainers[30716] = {:name => "Thoth"}
-				$trainers[30716][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30716}
-				$trainers[26995] = {:name => "Tink Brightbolt"}
-				$trainers[26995][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26995}
-				$trainers[30710] = {:name => "Zantasia"}
-				$trainers[30710][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30710}
+				acquire << add_npc_trainer(30713, "Catarina Stanford", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30717, "Elise Brightletter", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30715, "Feyden Darkin", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30706, "Jo'mah", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30711, "Margaux Parchley", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30709, "Poshken Hardbinder", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30716, "Thoth", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30710, "Zantasia", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30721, "Michael Schwan", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30722, "Neferatti", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26977, "Adelene Sunlance", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26959, "Booker Kells", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26916, "Mindri Dinkles", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(28702, "Professor Pallin", "Neutral", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26995, "Tink Brightbolt", "Alliance", npcfactions, acquirelisting)
 				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
 			when "MasterInscTrainer"
-				$trainers[26977] = {:name => "Adelene Sunlance"}
-				$trainers[26977][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26977}
-				$trainers[26959] = {:name => "Booker Kells"}
-				$trainers[26959][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26959}
-				$trainers[30721] = {:name => "Michael Schwan"}
-				$trainers[30721][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30721}
-				$trainers[26916] = {:name => "Mindri Dinkles"}
-				$trainers[26916][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26916}
-				$trainers[30722] = {:name => "Neferatti"}
-				$trainers[30722][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 30722}
-				$trainers[28702] = {:name => "Professor Pallin"}
-				$trainers[28702][:faction] = npcfactions["Neutral"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 28702}
-				$trainers[26995] = {:name => "Tink Brightbolt"}
-				$trainers[26995][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26995}
+				acquire << add_npc_trainer(30721, "Michael Schwan", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(30722, "Neferatti", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26977, "Adelene Sunlance", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26959, "Booker Kells", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26916, "Mindri Dinkles", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(28702, "Professor Pallin", "Neutral", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26995, "Tink Brightbolt", "Alliance", npcfactions, acquirelisting)
 				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
 			when "GrandMasterInscTrainer"
-				$trainers[26977] = {:name => "Adelene Sunlance"}
-				$trainers[26977][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26977}
-				$trainers[26959] = {:name => "Booker Kells"}
-				$trainers[26959][:faction] = npcfactions["Horde"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26959}
-				$trainers[26916] = {:name => "Mindri Dinkles"}
-				$trainers[26916][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26916}
-				$trainers[28702] = {:name => "Professor Pallin"}
-				$trainers[28702][:faction] = npcfactions["Neutral"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 28702}
-				$trainers[26995] = {:name => "Tink Brightbolt"}
-				$trainers[26995][:faction] = npcfactions["Alliance"]
-				acquire << {"type" => acquirelisting["Trainer"],
-							"id" => 26995}
+				acquire << add_npc_trainer(26977, "Adelene Sunlance", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26959, "Booker Kells", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26916, "Mindri Dinkles", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(28702, "Professor Pallin", "Neutral", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26995, "Tink Brightbolt", "Alliance", npcfactions, acquirelisting)
+				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
+			when "GrandMasterJCTrainer"
+				acquire << add_npc_trainer(26997, "Alestos", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26960, "Carter Tiffens", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26982, "Geba'li", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26915, "Ounhulo", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(28701, "Timothy Jones", "Neutral", npcfactions, acquirelisting)
+				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
+			when "GrandMasterLWTrainer"
+				acquire << add_npc_trainer(26996, "Awan Iceborn", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26911, "Bernadette Dexter", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(28700, "Diane Cannings", "Neutral", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26961, "Gunter Hansen", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26998, "Rosemary Bovard", "Alliance", npcfactions, acquirelisting)
+				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
+			when "GrandMasterTailorTrainer"
+				acquire << add_npc_trainer(26964, "Alexandra McQueen", "Horde", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26914, "Benjamin Clegg", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(28699, "Charles Worth", "Neutral", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(27001, "Darin Goodstitch", "Alliance", npcfactions, acquirelisting)
+				acquire << add_npc_trainer(26969, "Raenah", "Horde", npcfactions, acquirelisting)
 				flags << flaglisting["Alliance"] << flaglisting["Horde"] << flaglisting["Trainer"]
 			when "meleedps"
 				flags << playertypeflags["MeleeDPS"]
@@ -1871,7 +1845,11 @@ def create_stats_list()
 	stats_lua.puts("\nUnknown faction:")
 
 	$unknownfaction.sort_by { |unknownfaction| unknownfaction[:name] }.each do |k|
-		stats_lua.puts "\t\#\"#{k[:name]}\" => #{k[:react]}, \# #{k[:loc]}"
+		if k[:loc] == "N/A"
+			stats_lua.puts "\t\#\"#{k[:name]}\" => #{k[:react]},"
+		else
+			stats_lua.puts "\t\#\"#{k[:name]}\" => #{k[:react]}, \# #{k[:loc]}"
+		end
 	end
 
 	stats_lua.puts("\n\nNo acquire information:")
@@ -3145,35 +3123,6 @@ if $debug
 	create_custom_db()
 	create_faction_db()
 
-	blacksmithing = recipes.get_blacksmithing_list
-	bsspeciallist = {
-		2660 => {:id => "StartingSkill"},
-		2663 => {:id => "StartingSkill"},
-		2671 => {:id => "StartingSkill"},
-		3115 => {:id => "StartingSkill"},
-		21913 => {:id => 7, :type => 1},
-		28242 => {:id => "ADNaxx40E"},
-		28243 => {:id => "ADNaxx40R"},
-		28244 => {:id => "ADNaxx40R"},
-		}
-	bsmanual=<<EOF
-	-- Orcish War Leggings -- 9957
-	-- Quest
-	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail, 
-	-- Item Stats: 
-	-- Item Stats: val17id1val208id6
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB, 9957,230,7929,2,2018)
-	self:addTradeFlags(RecipeDB, 9957,2,8,21,22,23,24,25,26,27,28,29,30,36,41,47,58)
-	self:addTradeAcquire(RecipeDB, 9957,4,2756)
-EOF
-
-	# Add the Orcish War Leggings quest
-	$quests[2756] = {:name => "The Old Ways"}
-	$quests[2756][:faction] = 2
-
-	create_profession_db("./RecipeDB/ARL-Blacksmith.lua","Blacksmithing",recipes,maps,"InitBlacksmithing",blacksmithing,[2671,8366,8368,9942,9957,16960,16965,16967,16980,16986,16987],bsspeciallist,bsmanual)
-
 	create_stats_list()
 
 	#create_lookup_db("./RecipeDB/ARL-Trainer.lua","Trainer","TrainerDB","InitTrainer",$trainers,maps,[])
@@ -3293,6 +3242,105 @@ EOF
 		28242 => {:id => "ADNaxx40E"},
 		28243 => {:id => "ADNaxx40R"},
 		28244 => {:id => "ADNaxx40R"},
+		52567 => {:id => "GrandMasterBSTrainer"},
+		52568 => {:id => "GrandMasterBSTrainer"},
+		52569 => {:id => "GrandMasterBSTrainer"},
+		52570 => {:id => "GrandMasterBSTrainer"},
+		52571 => {:id => "GrandMasterBSTrainer"},
+		52572 => {:id => "GrandMasterBSTrainer"},
+		54550 => {:id => "GrandMasterBSTrainer"},
+		54551 => {:id => "GrandMasterBSTrainer"},
+		54552 => {:id => "GrandMasterBSTrainer"},
+		54553 => {:id => "GrandMasterBSTrainer"},
+		54554 => {:id => "GrandMasterBSTrainer"},
+		54555 => {:id => "GrandMasterBSTrainer"},
+		54556 => {:id => "GrandMasterBSTrainer"},
+		54557 => {:id => "GrandMasterBSTrainer"},
+		54917 => {:id => "GrandMasterBSTrainer"},
+		54918 => {:id => "GrandMasterBSTrainer"},
+		54941 => {:id => "GrandMasterBSTrainer"},
+		54944 => {:id => "GrandMasterBSTrainer"},
+		54945 => {:id => "GrandMasterBSTrainer"},
+		54946 => {:id => "GrandMasterBSTrainer"},
+		54947 => {:id => "GrandMasterBSTrainer"},
+		54948 => {:id => "GrandMasterBSTrainer"},
+		54949 => {:id => "GrandMasterBSTrainer"},
+		55013 => {:id => "GrandMasterBSTrainer"},
+		55014 => {:id => "GrandMasterBSTrainer"},
+		55015 => {:id => "GrandMasterBSTrainer"},
+		55017 => {:id => "GrandMasterBSTrainer"},
+		55055 => {:id => "GrandMasterBSTrainer"},
+		55056 => {:id => "GrandMasterBSTrainer"},
+		55057 => {:id => "GrandMasterBSTrainer"},
+		55058 => {:id => "GrandMasterBSTrainer"},
+		55174 => {:id => "GrandMasterBSTrainer"},
+		55177 => {:id => "GrandMasterBSTrainer"},
+		55179 => {:id => "GrandMasterBSTrainer"},
+		55181 => {:id => "GrandMasterBSTrainer"},
+		55182 => {:id => "GrandMasterBSTrainer"},
+		55183 => {:id => "GrandMasterBSTrainer"},
+		55184 => {:id => "GrandMasterBSTrainer"},
+		55185 => {:id => "GrandMasterBSTrainer"},
+		55186 => {:id => "GrandMasterBSTrainer"},
+		55187 => {:id => "GrandMasterBSTrainer"},
+		55200 => {:id => "GrandMasterBSTrainer"},
+		55201 => {:id => "GrandMasterBSTrainer"},
+		55202 => {:id => "GrandMasterBSTrainer"},
+		55203 => {:id => "GrandMasterBSTrainer"},
+		55204 => {:id => "GrandMasterBSTrainer"},
+		55206 => {:id => "GrandMasterBSTrainer"},
+		55298 => {:id => "GrandMasterBSTrainer"},
+		55300 => {:id => "GrandMasterBSTrainer"},
+		55301 => {:id => "GrandMasterBSTrainer"},
+		55302 => {:id => "GrandMasterBSTrainer"},
+		55303 => {:id => "GrandMasterBSTrainer"},
+		55304 => {:id => "GrandMasterBSTrainer"},
+		55305 => {:id => "GrandMasterBSTrainer"},
+		55306 => {:id => "GrandMasterBSTrainer"},
+		55307 => {:id => "GrandMasterBSTrainer"},
+		55308 => {:id => "GrandMasterBSTrainer"},
+		55309 => {:id => "GrandMasterBSTrainer"},
+		55310 => {:id => "GrandMasterBSTrainer"},
+		55311 => {:id => "GrandMasterBSTrainer"},
+		55312 => {:id => "GrandMasterBSTrainer"},
+		55369 => {:id => "GrandMasterBSTrainer"},
+		55370 => {:id => "GrandMasterBSTrainer"},
+		55371 => {:id => "GrandMasterBSTrainer"},
+		55372 => {:id => "GrandMasterBSTrainer"},
+		55373 => {:id => "GrandMasterBSTrainer"},
+		55374 => {:id => "GrandMasterBSTrainer"},
+		55375 => {:id => "GrandMasterBSTrainer"},
+		55376 => {:id => "GrandMasterBSTrainer"},
+		55377 => {:id => "GrandMasterBSTrainer"},
+		55628 => {:id => "GrandMasterBSTrainer"},
+		55641 => {:id => "GrandMasterBSTrainer"},
+		55656 => {:id => "GrandMasterBSTrainer"},
+		55732 => {:id => "GrandMasterBSTrainer"},
+		55834 => {:id => "GrandMasterBSTrainer"},
+		55835 => {:id => "GrandMasterBSTrainer"},
+		55839 => {:id => "GrandMasterBSTrainer"},
+		56234 => {:id => "GrandMasterBSTrainer"},
+		56280 => {:id => "GrandMasterBSTrainer"},
+		56357 => {:id => "GrandMasterBSTrainer"},
+		56400 => {:id => "GrandMasterBSTrainer"},
+		56549 => {:id => "GrandMasterBSTrainer"},
+		56550 => {:id => "GrandMasterBSTrainer"},
+		56551 => {:id => "GrandMasterBSTrainer"},
+		56552 => {:id => "GrandMasterBSTrainer"},
+		56553 => {:id => "GrandMasterBSTrainer"},
+		56554 => {:id => "GrandMasterBSTrainer"},
+		56555 => {:id => "GrandMasterBSTrainer"},
+		56556 => {:id => "GrandMasterBSTrainer"},
+		59405 => {:id => "GrandMasterBSTrainer"},
+		59406 => {:id => "GrandMasterBSTrainer"},
+		59436 => {:id => "GrandMasterBSTrainer"},
+		59438 => {:id => "GrandMasterBSTrainer"},
+		59440 => {:id => "GrandMasterBSTrainer"},
+		59441 => {:id => "GrandMasterBSTrainer"},
+		59442 => {:id => "GrandMasterBSTrainer"},
+		61008 => {:id => "GrandMasterBSTrainer"},
+		61009 => {:id => "GrandMasterBSTrainer"},
+		61010 => {:id => "GrandMasterBSTrainer"},
 		}
 	bsmanual=<<EOF
 	-- Orcish War Leggings -- 9957
@@ -3359,8 +3407,51 @@ EOF
 
 	enchanting = recipes.get_enchanting_list
 	enchantingspeciallist = {
+		7418 => {:id => "StartingSkill"},
+		7421 => {:id => "StartingSkill"},
+		7428 => {:id => "StartingSkill"},
 		21931 => {:id => 7, :type => 1},
-		46578 => {:id => 7, :type => 4}
+		46578 => {:id => 7, :type => 4},
+		60619 => {:id => "GrandMasterEnchTrainer"},
+		44630 => {:id => "GrandMasterEnchTrainer"},
+		60606 => {:id => "GrandMasterEnchTrainer"},
+		44528 => {:id => "GrandMasterEnchTrainer"},
+		44508 => {:id => "GrandMasterEnchTrainer"},
+		44584 => {:id => "GrandMasterEnchTrainer"},
+		60623 => {:id => "GrandMasterEnchTrainer"},
+		44589 => {:id => "GrandMasterEnchTrainer"},
+		44555 => {:id => "GrandMasterEnchTrainer"},
+		44598 => {:id => "GrandMasterEnchTrainer"},
+		44635 => {:id => "GrandMasterEnchTrainer"},
+		44616 => {:id => "GrandMasterEnchTrainer"},
+		44593 => {:id => "GrandMasterEnchTrainer"},
+		60616 => {:id => "GrandMasterEnchTrainer"},
+		60767 => {:id => "GrandMasterEnchTrainer"},
+		47766 => {:id => "GrandMasterEnchTrainer"},
+		44509 => {:id => "GrandMasterEnchTrainer"},
+		44492 => {:id => "GrandMasterEnchTrainer"},
+		47900 => {:id => "GrandMasterEnchTrainer"},
+		44623 => {:id => "GrandMasterEnchTrainer"},
+		60663 => {:id => "GrandMasterEnchTrainer"},
+		60609 => {:id => "GrandMasterEnchTrainer"},
+		44582 => {:id => "GrandMasterEnchTrainer"},
+		44500 => {:id => "GrandMasterEnchTrainer"},
+		60668 => {:id => "GrandMasterEnchTrainer"},
+		44592 => {:id => "GrandMasterEnchTrainer"},
+		44484 => {:id => "GrandMasterEnchTrainer"},
+		44506 => {:id => "GrandMasterEnchTrainer"},
+		44513 => {:id => "GrandMasterEnchTrainer"},
+		44529 => {:id => "GrandMasterEnchTrainer"},
+		44488 => {:id => "GrandMasterEnchTrainer"},
+		44645 => {:id => "GrandMasterEnchTrainer"},
+		44636 => {:id => "GrandMasterEnchTrainer"},
+		59636 => {:id => "GrandMasterEnchTrainer"},
+		44489 => {:id => "GrandMasterEnchTrainer"},
+		60653 => {:id => "GrandMasterEnchTrainer"},
+		44633 => {:id => "GrandMasterEnchTrainer"},
+		44629 => {:id => "GrandMasterEnchTrainer"},
+		44510 => {:id => "GrandMasterEnchTrainer"},
+		60621 => {:id => "GrandMasterEnchTrainer"},
 		}
 	enchantmanual=<<EOF
 EOF
diff --git a/RecipeBS.txt b/RecipeBS.txt
deleted file mode 100644
index fcd4dad..0000000
--- a/RecipeBS.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-No acquire information:
-3496 - Moonsteel Broadsword - Blacksmithing
-3503 - Golden Scale Coif - Blacksmithing
-9972 - Ornate Mithril Breastplate - Blacksmithing
-9979 - Ornate Mithril Boots - Blacksmithing
-9980 - Ornate Mithril Helm - Blacksmithing
-12260 - Rough Copper Vest - Blacksmithing
-15295 - Dark Iron Shoulders - Blacksmithing
-15973 - Searing Golden Blade - Blacksmithing
-16664 - Runic Plate Shoulders - Blacksmithing
-16983 - Serenity - Blacksmithing
-16985 - Corruption - Blacksmithing
-20872 - Fiery Chain Girdle - Blacksmithing
-20873 - Fiery Chain Shoulders - Blacksmithing
-20876 - Dark Iron Leggings - Blacksmithing
-20890 - Dark Iron Reaver - Blacksmithing
-20897 - Dark Iron Destroyer - Blacksmithing
-23636 - Dark Iron Helm - Blacksmithing
-23637 - Dark Iron Gauntlets - Blacksmithing
-23638 - Black Amnesty - Blacksmithing
-23639 - Blackfury - Blacksmithing
-23650 - Ebon Hand - Blacksmithing
-23652 - Blackguard - Blacksmithing
-23653 - Nightfall - Blacksmithing
-24399 - Dark Iron Boots - Blacksmithing
-24912 - Darkrune Gauntlets - Blacksmithing
-24913 - Darkrune Helm - Blacksmithing
-24914 - Darkrune Breastplate - Blacksmithing
-42662 - Ragesteel Shoulders - Blacksmithing
-42688 - Adamantite Weapon Chain - Blacksmithing
-52567 - Cobalt Legplates - Blacksmithing
-52568 - Cobalt Belt - Blacksmithing
-52569 - Cobalt Boots - Blacksmithing
-52570 - Cobalt Chestpiece - Blacksmithing
-52571 - Cobalt Helm - Blacksmithing
-52572 - Cobalt Shoulders - Blacksmithing
-54550 - Cobalt Triangle Shield - Blacksmithing
-54551 - Tempered Saronite Belt - Blacksmithing
-54552 - Tempered Saronite Boots - Blacksmithing
-54553 - Tempered Saronite Breastplate - Blacksmithing
-54554 - Tempered Saronite Legplates - Blacksmithing
-54555 - Tempered Saronite Helm - Blacksmithing
-54556 - Tempered Saronite Shoulders - Blacksmithing
-54557 - Saronite Defender - Blacksmithing
-54917 - Spiked Cobalt Helm - Blacksmithing
-54918 - Spiked Cobalt Boots - Blacksmithing
-54941 - Spiked Cobalt Shoulders - Blacksmithing
-54944 - Spiked Cobalt Chestpiece - Blacksmithing
-54945 - Spiked Cobalt Gauntlets - Blacksmithing
-54946 - Spiked Cobalt Belt - Blacksmithing
-54947 - Spiked Cobalt Legplates - Blacksmithing
-54948 - Spiked Cobalt Bracers - Blacksmithing
-54949 - Horned Cobalt Helm - Blacksmithing
-55013 - Saronite Protector - Blacksmithing
-55014 - Saronite Bulwark - Blacksmithing
-55015 - Tempered Saronite Gauntlets - Blacksmithing
-55017 - Tempered Saronite Bracers - Blacksmithing
-55055 - Brilliant Saronite Legplates - Blacksmithing
-55056 - Brilliant Saronite Gauntlets - Blacksmithing
-55057 - Brilliant Saronite Boots - Blacksmithing
-55058 - Brilliant Saronite Breastplate - Blacksmithing
-55174 - Honed Cobalt Cleaver - Blacksmithing
-55177 - Savage Cobalt Slicer - Blacksmithing
-55179 - Saronite Ambusher - Blacksmithing
-55181 - Saronite Shiv - Blacksmithing
-55182 - Furious Saronite Beatstick - Blacksmithing
-55183 - Corroded Saronite Edge - Blacksmithing
-55184 - Corroded Saronite Woundbringer - Blacksmithing
-55185 - Saronite Mindcrusher - Blacksmithing
-55186 - Chestplate of Conquest - Blacksmithing
-55187 - Legplates of Conquest - Blacksmithing
-55200 - Sturdy Cobalt Quickblade - Blacksmithing
-55201 - Cobalt Tenderizer - Blacksmithing
-55202 - Sure-fire Shuriken - Blacksmithing
-55203 - Forged Cobalt Claymore - Blacksmithing
-55204 - Notched Cobalt War Axe - Blacksmithing
-55206 - Deadly Saronite Dirk - Blacksmithing
-55298 - Vengeance Bindings - Blacksmithing
-55300 - Righteous Gauntlets - Blacksmithing
-55301 - Daunting Handguards - Blacksmithing
-55302 - Helm of Command - Blacksmithing
-55303 - Daunting Legplates - Blacksmithing
-55304 - Righteous Greaves - Blacksmithing
-55305 - Savage Saronite Bracers - Blacksmithing
-55306 - Savage Saronite Pauldrons - Blacksmithing
-55307 - Savage Saronite Waistguard - Blacksmithing
-55308 - Savage Saronite Walkers - Blacksmithing
-55309 - Savage Saronite Gauntlets - Blacksmithing
-55310 - Savage Saronite Legplates - Blacksmithing
-55311 - Savage Saronite Hauberk - Blacksmithing
-55312 - Savage Saronite Skullshield - Blacksmithing
-55369 - Titansteel Destroyer - Blacksmithing
-55370 - Titansteel Bonecrusher - Blacksmithing
-55371 - Titansteel Guardian - Blacksmithing
-55372 - Spiked Titansteel Helm - Blacksmithing
-55373 - Tempered Titansteel Helm - Blacksmithing
-55374 - Brilliant Titansteel Helm - Blacksmithing
-55375 - Spiked Titansteel Treads - Blacksmithing
-55376 - Tempered Titansteel Treads - Blacksmithing
-55377 - Brilliant Titansteel Treads - Blacksmithing
-55628 - Socket Bracer - Blacksmithing
-55641 - Socket Gloves - Blacksmithing
-55656 - Eternal Belt Buckle - Blacksmithing
-55732 - Titanium Rod - Blacksmithing
-55834 - Cobalt Bracers - Blacksmithing
-55835 - Cobalt Gauntlets - Blacksmithing
-55839 - Titanium Weapon Chain - Blacksmithing
-56234 - Titansteel Shanker - Blacksmithing
-56280 - Cudgel of Saronite Justice - Blacksmithing
-56357 - Titanium Shield Spike - Blacksmithing
-56400 - Titansteel Shield Wall - Blacksmithing
-56549 - Ornate Saronite Bracers - Blacksmithing
-56550 - Ornate Saronite Pauldrons - Blacksmithing
-56551 - Ornate Saronite Waistguard - Blacksmithing
-56552 - Ornate Saronite Walkers - Blacksmithing
-56553 - Ornate Saronite Gauntlets - Blacksmithing
-56554 - Ornate Saronite Legplates - Blacksmithing
-56555 - Ornate Saronite Hauberk - Blacksmithing
-56556 - Ornate Saronite Skullshield - Blacksmithing
-59405 - Cobalt Skeleton Key - Blacksmithing
-59406 - Titanium Skeleton Key - Blacksmithing
-59436 - Brilliant Saronite Belt - Blacksmithing
-59438 - Brilliant Saronite Bracers - Blacksmithing
-59440 - Brilliant Saronite Pauldrons - Blacksmithing
-59441 - Brilliant Saronite Helm - Blacksmithing
-59442 - Saronite Spellblade - Blacksmithing
-61008 - Icebane Chestguard - Blacksmithing
-61009 - Icebane Girdle - Blacksmithing
-61010 - Icebane Treads - Blacksmithing
-
diff --git a/RecipeDB/ARL-Alchemy.lua b/RecipeDB/ARL-Alchemy.lua
index 70d7e9d..3ea8a43 100644
--- a/RecipeDB/ARL-Alchemy.lua
+++ b/RecipeDB/ARL-Alchemy.lua
@@ -166,8 +166,8 @@ function addon:InitAlchemy(RecipeDB)
 	-- Shadow Oil -- 3449
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3449,165,3824,1,2259)
-	self:addTradeFlags(RecipeDB,3449,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,3449,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,3449,2,2481,2,4878)
 
 	-- Elixir of Fortitude -- 3450
 	recipecount = recipecount + 1
@@ -226,8 +226,8 @@ function addon:InitAlchemy(RecipeDB)
 	-- Free Action Potion -- 6624
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,6624,150,5634,1,2259)
-	self:addTradeFlags(RecipeDB,6624,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,6624,2,3348)
+	self:addTradeFlags(RecipeDB,6624,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	-- No acquire information
 
 	-- Elixir of Water Breathing -- 7179
 	recipecount = recipecount + 1
@@ -256,20 +256,20 @@ function addon:InitAlchemy(RecipeDB)
 	-- Shadow Protection Potion -- 7256
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7256,135,6048,1,2259)
-	self:addTradeFlags(RecipeDB,7256,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,7256,2,2393,2,3956)
+	self:addTradeFlags(RecipeDB,7256,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,7256,2,2393)
 
 	-- Fire Protection Potion -- 7257
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7257,165,6049,1,2259)
-	self:addTradeFlags(RecipeDB,7257,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,7257,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,7257,2,2380,2,4083)
 
 	-- Frost Protection Potion -- 7258
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7258,190,6050,1,2259)
-	self:addTradeFlags(RecipeDB,7258,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,7258,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,7258,2,2812,2,2848)
 
 	-- Nature Protection Potion -- 7259
 	recipecount = recipecount + 1
@@ -418,14 +418,14 @@ function addon:InitAlchemy(RecipeDB)
 	-- Ghost Dye -- 11473
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,11473,245,9210,1,2259)
-	self:addTradeFlags(RecipeDB,11473,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,11473,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,11473,2,8158)
 
 	-- Elixir of Shadow Power -- 11476
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,11476,250,9264,2,2259)
-	self:addTradeFlags(RecipeDB,11476,3,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,11476,1,9264)
+	self:addTradeFlags(RecipeDB,11476,1,3,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,11476,1,9264,2,1313)
 
 	-- Elixir of Demonslaying -- 11477
 	recipecount = recipecount + 1
@@ -490,8 +490,8 @@ function addon:InitAlchemy(RecipeDB)
 	-- Elixir of Superior Defense -- 17554
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,17554,265,13445,1,2259)
-	self:addTradeFlags(RecipeDB,17554,1,2,3,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,17554,1,13445)
+	self:addTradeFlags(RecipeDB,17554,1,2,3,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,17554,1,13445,2,3348)
 
 	-- Elixir of the Sages -- 17555
 	recipecount = recipecount + 1
diff --git a/RecipeDB/ARL-Blacksmith.lua b/RecipeDB/ARL-Blacksmith.lua
index 0a13e7b..c090ccd 100644
--- a/RecipeDB/ARL-Blacksmith.lua
+++ b/RecipeDB/ARL-Blacksmith.lua
@@ -323,7 +323,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3494,155,3851,1,2018)
 	self:addTradeFlags(RecipeDB,3494,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40,70)
-	self:addTradeAcquire(RecipeDB,3494,2,1471,2,9179)
+	self:addTradeAcquire(RecipeDB,3494,2,1471,2,8878,2,9179)
 
 	-- Golden Iron Destroyer -- 3495
 	recipecount = recipecount + 1
@@ -334,8 +334,8 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Moonsteel Broadsword -- 3496
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3496,180,3853,1,2018)
-	self:addTradeFlags(RecipeDB,3496,3,21,22,23,24,25,26,27,28,29,30,36,41,69)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,3496,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40,69)
+	self:addTradeAcquire(RecipeDB,3496,2,2482)
 
 	-- Frost Tiger Blade -- 3497
 	recipecount = recipecount + 1
@@ -346,8 +346,8 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Massive Iron Axe -- 3498
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3498,185,3855,1,2018)
-	self:addTradeFlags(RecipeDB,3498,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40,68)
-	self:addTradeAcquire(RecipeDB,3498,2,2483)
+	self:addTradeFlags(RecipeDB,3498,3,21,22,23,24,25,26,27,28,29,30,36,41,68)
+	-- No acquire information
 
 	-- Shadow Crescent Axe -- 3500
 	recipecount = recipecount + 1
@@ -370,8 +370,8 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Golden Scale Coif -- 3503
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3503,190,3837,1,2018)
-	self:addTradeFlags(RecipeDB,3503,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40,58)
-	self:addTradeAcquire(RecipeDB,3503,2,5411)
+	self:addTradeFlags(RecipeDB,3503,3,21,22,23,24,25,26,27,28,29,30,36,41,58)
+	-- No acquire information
 
 	-- Green Iron Shoulders -- 3504
 	recipecount = recipecount + 1
@@ -592,8 +592,8 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Mithril Scale Bracers -- 9937
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,9937,215,7924,1,2018)
-	self:addTradeFlags(RecipeDB,9937,2,4,21,22,23,24,25,26,27,28,29,30,36,40,58)
-	self:addTradeAcquire(RecipeDB,9937,2,8176)
+	self:addTradeFlags(RecipeDB,9937,3,21,22,23,24,25,26,27,28,29,30,36,41,58)
+	-- No acquire information
 
 	-- Mithril Shield Spike -- 9939
 	recipecount = recipecount + 1
@@ -905,7 +905,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,16645,260,12416,2,2018)
 	self:addTradeFlags(RecipeDB,16645,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,40,58)
-	self:addTradeAcquire(RecipeDB,16645,3,10184)
+	self:addTradeAcquire(RecipeDB,16645,3,6513,3,10184)
 
 	-- Imperial Plate Shoulders -- 16646
 	recipecount = recipecount + 1
diff --git a/RecipeDB/ARL-Cook.lua b/RecipeDB/ARL-Cook.lua
index a5fde0e..002db6e 100644
--- a/RecipeDB/ARL-Cook.lua
+++ b/RecipeDB/ARL-Cook.lua
@@ -9,7 +9,7 @@ Cooking data for all of Ackis Recipe List
 Auto-generated using ARLDataminer.rb
 Entries to this file will be overwritten
 160 found from data mining.
-1 ignored.
+5 ignored.
 
 ************************************************************************
 
@@ -118,7 +118,7 @@ function addon:InitCooking(RecipeDB)
 	-- Crocolisk Steak -- 3370
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3370,80,3662,1,2550)
-	self:addTradeFlags(RecipeDB,3370,1,4,8,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeFlags(RecipeDB,3370,1,2,4,8,21,22,23,24,25,26,27,28,29,30,36,40)
 	self:addTradeAcquire(RecipeDB,3370,4,385,2,340)
 
 	-- Blood Sausage -- 3371
@@ -160,8 +160,8 @@ function addon:InitCooking(RecipeDB)
 	-- Hot Lion Chops -- 3398
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3398,125,3727,1,2550)
-	self:addTradeFlags(RecipeDB,3398,1,2,4,8,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,3398,4,501,2,3489,2,12245)
+	self:addTradeFlags(RecipeDB,3398,2,4,8,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,3398,4,501,2,3489)
 
 	-- Tasty Lion Steak -- 3399
 	recipecount = recipecount + 1
@@ -226,8 +226,8 @@ function addon:InitCooking(RecipeDB)
 	-- Lean Venison -- 6419
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,6419,110,5480,1,2550)
-	self:addTradeFlags(RecipeDB,6419,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,6419,2,3960,2,12245)
+	self:addTradeFlags(RecipeDB,6419,1,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,6419,2,3960)
 
 	-- Boiled Clams -- 6499
 	recipecount = recipecount + 1
@@ -257,7 +257,7 @@ function addon:InitCooking(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7751,1,6290,1,2550)
 	self:addTradeFlags(RecipeDB,7751,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,7751,2,66,2,1684,2,3029,2,3550,2,4265,2,4574,2,5494,2,5940,2,8508)
+	self:addTradeAcquire(RecipeDB,7751,2,66,2,1684,2,3029,2,3550,2,4574,2,5494,2,5940,2,8508)
 
 	-- Slitherskin Mackerel -- 7752
 	recipecount = recipecount + 1
@@ -269,7 +269,7 @@ function addon:InitCooking(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7753,50,4592,1,2550)
 	self:addTradeFlags(RecipeDB,7753,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,7753,2,66,2,1684,2,3027,2,4265,2,4574,2,5162,2,5748,2,5940)
+	self:addTradeAcquire(RecipeDB,7753,2,66,2,1684,2,3027,2,4574,2,5162,2,5748,2,5940)
 
 	-- Loch Frenzy Delight -- 7754
 	recipecount = recipecount + 1
@@ -335,7 +335,7 @@ function addon:InitCooking(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,15855,175,12210,1,2550)
 	self:addTradeFlags(RecipeDB,15855,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,15855,2,734,2,1148,2,2810,2,2821,2,4879,2,4897,2,12245)
+	self:addTradeAcquire(RecipeDB,15855,2,734,2,1148,2,2810,2,2821,2,4879,2,4897)
 
 	-- Hot Wolf Ribs -- 15856
 	recipecount = recipecount + 1
@@ -347,13 +347,13 @@ function addon:InitCooking(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,15861,175,12212,1,2550)
 	self:addTradeFlags(RecipeDB,15861,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,15861,2,734,2,1148,2,12245)
+	self:addTradeAcquire(RecipeDB,15861,2,734,2,1148)
 
 	-- Carrion Surprise -- 15863
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,15863,175,12213,1,2550)
-	self:addTradeFlags(RecipeDB,15863,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,15863,2,989,2,4879,2,9636,2,12245)
+	self:addTradeFlags(RecipeDB,15863,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,15863,2,989,2,4879,2,9636)
 
 	-- Mystery Stew -- 15865
 	recipecount = recipecount + 1
@@ -371,7 +371,7 @@ function addon:InitCooking(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,15910,200,12215,1,2550)
 	self:addTradeFlags(RecipeDB,15910,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,15910,2,8150,2,9636,2,12245)
+	self:addTradeAcquire(RecipeDB,15910,2,8150,2,9636)
 
 	-- Spiced Chili Crab -- 15915
 	recipecount = recipecount + 1
@@ -412,14 +412,14 @@ function addon:InitCooking(RecipeDB)
 	-- Filet of Redgill -- 18241
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,18241,225,13930,1,2550)
-	self:addTradeFlags(RecipeDB,18241,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,18241,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,18241,2,2664)
 
 	-- Hot Smoked Bass -- 18242
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,18242,240,13929,1,2550)
-	self:addTradeFlags(RecipeDB,18242,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,18242,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,18242,2,2664)
 
 	-- Nightfin Soup -- 18243
 	recipecount = recipecount + 1
@@ -466,14 +466,14 @@ function addon:InitCooking(RecipeDB)
 	-- Gingerbread Cookie -- 21143
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,21143,1,17197,1,2550)
-	self:addTradeFlags(RecipeDB,21143,1,2,3,7,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,21143,5,1)
+	self:addTradeFlags(RecipeDB,21143,1,2,4,7,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,21143,5,1,2,13420,2,13429,2,13433,2,13435)
 
 	-- Egg Nog -- 21144
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,21144,35,17198,1,2550)
-	self:addTradeFlags(RecipeDB,21144,3,7,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,21144,5,1)
+	self:addTradeFlags(RecipeDB,21144,1,2,4,7,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,21144,5,1,2,13420,2,13429,2,13432,2,13433,2,13435,2,23064)
 
 	-- Spider Sausage -- 21175
 	recipecount = recipecount + 1
@@ -515,13 +515,13 @@ function addon:InitCooking(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,25704,80,21072,1,2550)
 	self:addTradeFlags(RecipeDB,25704,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,25704,2,2381,2,2397,2,2664,2,3027,2,3085,2,3400,2,4223,2,4265,2,4553,2,5160,2,5483,2,8307,2,12033,2,14738,2,16253,2,16677,2,16718,2,17246,2,19195,2,26868)
+	self:addTradeAcquire(RecipeDB,25704,2,2381,2,2397,2,2664,2,3027,2,3085,2,3400,2,4223,2,4553,2,5160,2,5483,2,8307,2,12033,2,14738,2,16253,2,16677,2,16718,2,17246,2,19195,2,26868)
 
 	-- Sagefish Delight -- 25954
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,25954,175,21217,1,2550)
 	self:addTradeFlags(RecipeDB,25954,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,25954,2,2381,2,2397,2,2664,2,3027,2,3085,2,3400,2,4223,2,4265,2,4553,2,5160,2,5483,2,8307,2,12033,2,14738,2,16253,2,16677,2,16718,2,17246,2,19195,2,26868)
+	self:addTradeAcquire(RecipeDB,25954,2,2381,2,2397,2,2664,2,3027,2,3085,2,3400,2,4223,2,4553,2,5160,2,5483,2,8307,2,12033,2,14738,2,16253,2,16677,2,16718,2,17246,2,19195,2,26868)
 
 	-- Crunchy Spider Surprise -- 28267
 	recipecount = recipecount + 1
@@ -712,8 +712,8 @@ function addon:InitCooking(RecipeDB)
 	-- Hot Apple Cider -- 45022
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,45022,325,34411,1,2550)
-	self:addTradeFlags(RecipeDB,45022,3,7,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,45022,5,1)
+	self:addTradeFlags(RecipeDB,45022,1,2,4,7,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,45022,5,1,2,13420,2,13433)
 
 	-- Mammoth Meal -- 45549
 	recipecount = recipecount + 1
@@ -872,10 +872,10 @@ function addon:InitCooking(RecipeDB)
 	self:addTradeAcquire(RecipeDB,46688,2,2803,2,2806)
 
 	-- Kungaloosh -- 53056
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,53056,375,39520,1,2550)
-	self:addTradeFlags(RecipeDB,53056,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,53056,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631)
+	--recipecount = recipecount + 1
+	--self:addTradeSkill(RecipeDB,53056,375,39520,1,2550)
+	--self:addTradeFlags(RecipeDB,53056,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	--self:addTradeAcquire(RecipeDB,53056,)
 
 	-- Northern Stew -- 57421
 	recipecount = recipecount + 1
@@ -884,10 +884,10 @@ function addon:InitCooking(RecipeDB)
 	self:addTradeAcquire(RecipeDB,57421,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631)
 
 	-- Fish Feast -- 57423
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,57423,360,43015,1, 2550)
-	self:addTradeFlags(RecipeDB,57423,1,2,3,21,22,23,24,25,26,27,28,29,30,37,41)
-	self:addTradeAcquire(RecipeDB,57423,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631)
+	--recipecount = recipecount + 1
+	--self:addTradeSkill(RecipeDB,57423,360,43015,1, 2550)
+	--self:addTradeFlags(RecipeDB,57423,3,21,22,23,24,25,26,27,28,29,30,37,41)
+	--self:addTradeAcquire(RecipeDB,57423,)
 
 	-- Spicy Fried Herring -- 57433
 	recipecount = recipecount + 1
@@ -922,38 +922,38 @@ function addon:InitCooking(RecipeDB)
 	-- Blackened Worg Steak -- 57438
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,57438,400,42997,2,2550)
-	self:addTradeFlags(RecipeDB,57438,1,4,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,57438,2,31032)
+	self:addTradeFlags(RecipeDB,57438,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,57438,2,31031,2,31032)
 
 	-- Cuttlesteak -- 57439
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,57439,400,42998,2,2550)
-	self:addTradeFlags(RecipeDB,57439,1,4,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,57439,2,31032)
+	self:addTradeFlags(RecipeDB,57439,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,57439,2,31031,2,31032)
 
 	-- Spiced Mammoth Treats -- 57440
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,57440,400,43005,2,2550)
-	self:addTradeFlags(RecipeDB,57440,1,4,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,57440,2,31032)
+	self:addTradeFlags(RecipeDB,57440,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,57440,2,31031,2,31032)
 
 	-- Blackened Dragonfin -- 57441
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,57441,400,42999,2,2550)
-	self:addTradeFlags(RecipeDB,57441,1,4,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,57441,2,31032)
+	self:addTradeFlags(RecipeDB,57441,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,57441,2,31031,2,31032)
 
 	-- Dragonfin Filet -- 57442
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,57442,400,43000,2,2550)
-	self:addTradeFlags(RecipeDB,57442,1,4,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,57442,2,31032)
+	self:addTradeFlags(RecipeDB,57442,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,57442,2,31031,2,31032)
 
 	-- Tracker Snacks -- 57443
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,57443,400,43001,2,2550)
-	self:addTradeFlags(RecipeDB,57443,1,4,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,57443,2,31032)
+	self:addTradeFlags(RecipeDB,57443,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,57443,2,31031,2,31032)
 
 	-- Dalaran Clam Chowder -- 58065
 	recipecount = recipecount + 1
@@ -988,14 +988,14 @@ function addon:InitCooking(RecipeDB)
 	-- Gigantic Feast -- 58527
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,58527,425,43478,2,2550)
-	self:addTradeFlags(RecipeDB,58527,1,4,21,22,23,24,25,26,27,28,29,30,37,41)
-	self:addTradeAcquire(RecipeDB,58527,2,31032)
+	self:addTradeFlags(RecipeDB,58527,1,2,4,21,22,23,24,25,26,27,28,29,30,37,41)
+	self:addTradeAcquire(RecipeDB,58527,2,31031,2,31032)
 
 	-- Small Feast -- 58528
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,58528,425,43480,2,2550)
-	self:addTradeFlags(RecipeDB,58528,1,4,21,22,23,24,25,26,27,28,29,30,37,41)
-	self:addTradeAcquire(RecipeDB,58528,2,31032)
+	self:addTradeFlags(RecipeDB,58528,1,2,4,21,22,23,24,25,26,27,28,29,30,37,41)
+	self:addTradeAcquire(RecipeDB,58528,2,31031,2,31032)
 
 
 	return recipecount
diff --git a/RecipeDB/ARL-Enchant.lua b/RecipeDB/ARL-Enchant.lua
index 05fce6c..273a7f6 100644
--- a/RecipeDB/ARL-Enchant.lua
+++ b/RecipeDB/ARL-Enchant.lua
@@ -178,8 +178,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Boots - Minor Agility -- 7867
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7867,125,nil, 2,7411)
-	self:addTradeFlags(RecipeDB,7867,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,7867,2,3012,2,3537)
+	self:addTradeFlags(RecipeDB,7867,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,7867,2,3012)
 
 	-- Enchant Shield - Minor Stamina -- 13378
 	recipecount = recipecount + 1
@@ -197,7 +197,7 @@ function addon:InitEnchanting(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,13419,110,nil, 2,7411)
 	self:addTradeFlags(RecipeDB,13419,1,2,4,10,21,22,23,24,25,26,27,28,29,30,36,40,63)
-	self:addTradeAcquire(RecipeDB,13419,7,2,2,3954)
+	self:addTradeAcquire(RecipeDB,13419,7,2,2,3954,2,12043)
 
 	-- Enchant Cloak - Lesser Protection -- 13421
 	recipecount = recipecount + 1
@@ -244,8 +244,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Bracer - Lesser Strength -- 13536
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,13536,140,nil, 2,7411)
-	self:addTradeFlags(RecipeDB,13536,1,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,13536,2,3954)
+	self:addTradeFlags(RecipeDB,13536,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,13536,2,3954,2,12043)
 
 	-- Enchant Chest - Lesser Absorption -- 13538
 	recipecount = recipecount + 1
@@ -682,8 +682,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Shield - Greater Stamina -- 20017
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,20017,265,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,20017,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,20017,1,4,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,20017,2,4229)
 
 	-- Enchant Boots - Greater Stamina -- 20020
 	recipecount = recipecount + 1
@@ -712,8 +712,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Chest - Major Health -- 20026
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,20026,275,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,20026,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,20026,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,20026,2,11189)
 
 	-- Enchant Chest - Major Mana -- 20028
 	recipecount = recipecount + 1
@@ -839,13 +839,13 @@ function addon:InitEnchanting(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,25073,300,nil, 3,7411)
 	self:addTradeFlags(RecipeDB,25073,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,25073,3,15263,3,15299,3,15348,3,15509,3,15510,3,15516,3,15517,3,15544)
+	self:addTradeAcquire(RecipeDB,25073,3,15263,3,15299,3,15348,3,15370,3,15509,3,15510,3,15516,3,15517,3,15544)
 
 	-- Enchant Gloves - Frost Power -- 25074
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,25074,300,nil, 3,7411)
-	self:addTradeFlags(RecipeDB,25074,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,25074,3,15263,3,15341,3,15348,3,15370,3,15509,3,15510,3,15511,3,15516,3,15517,3,15544)
+	self:addTradeFlags(RecipeDB,25074,1,2,10,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,25074,7,3)
 
 	-- Enchant Gloves - Fire Power -- 25078
 	recipecount = recipecount + 1
@@ -1301,7 +1301,7 @@ function addon:InitEnchanting(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,34007,360,nil, 3,7411)
 	self:addTradeFlags(RecipeDB,34007,1,2,5,6,11,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,34007,3,16407,3,16409,3,16471,3,16473,3,16504,3,17976)
+	self:addTradeAcquire(RecipeDB,34007,3,16407,3,16409,3,16471,3,16473,3,16504,3,17976,3,23339)
 
 	-- Enchant Boots - Boar's Speed -- 34008
 	recipecount = recipecount + 1
@@ -1360,26 +1360,26 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Gloves - Expertise -- 44484
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44484,395,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44484,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44484,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44484,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Gloves - Precision -- 44488
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44488,400,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44488,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44488,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44488,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Shield - Defense -- 44489
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44489,410,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44489,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44489,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44489,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Chest - Mighty Health -- 44492
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44492,385,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44492,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44492,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44492,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Cloak - Superior Nature Resistance -- 44494
 	recipecount = recipecount + 1
@@ -1390,38 +1390,38 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Cloak - Superior Agility -- 44500
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44500,385,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44500,3,21,22,23,24,25,26,27,28,29,30,36,41,63)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44500,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,63)
+	self:addTradeAcquire(RecipeDB,44500,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Gloves - Gatherer -- 44506
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44506,350,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44506,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44506,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44506,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Boots - Greater Spirit -- 44508
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44508,400,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44508,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44508,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44508,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Chest - Greater Mana Restoration -- 44509
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44509,410,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44509,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44509,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44509,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Weapon - Exceptional Spirit -- 44510
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44510,400,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44510,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44510,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44510,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Gloves - Greater Assault -- 44513
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44513,385,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44513,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44513,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44513,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Weapon - Icebreaker -- 44524
 	recipecount = recipecount + 1
@@ -1432,20 +1432,20 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Boots - Greater Fortitude -- 44528
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44528,360,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44528,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44528,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44528,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Gloves - Major Agility -- 44529
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44529,405,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44529,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44529,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44529,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Bracers - Exceptional Intellect -- 44555
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44555,370,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44555,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44555,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44555,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Cloak - Superior Fire Resistance -- 44556
 	recipecount = recipecount + 1
@@ -1468,14 +1468,14 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Cloak - Spell Piercing -- 44582
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44582,380,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44582,3,21,22,23,24,25,26,27,28,29,30,36,41,63)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44582,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,63)
+	self:addTradeAcquire(RecipeDB,44582,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Boots - Greater Vitality -- 44584
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44584,395,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44584,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44584,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44584,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Chest - Exceptional Resilience -- 44588
 	recipecount = recipecount + 1
@@ -1486,8 +1486,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Boots - Superior Agility -- 44589
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44589,405,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44589,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44589,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44589,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Cloak - Superior Shadow Resistance -- 44590
 	recipecount = recipecount + 1
@@ -1504,14 +1504,14 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Gloves - Exceptional Spellpower -- 44592
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44592,350,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44592,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44592,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44592,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Bracers - Major Spirit -- 44593
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44593,410,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44593,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44593,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44593,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant 2H Weapon - Scourgebane -- 44595
 	recipecount = recipecount + 1
@@ -1528,8 +1528,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Bracers - Expertise -- 44598
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44598,405,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44598,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44598,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44598,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Gloves - Greater Blasting -- 44612
 	recipecount = recipecount + 1
@@ -1540,8 +1540,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Bracers - Greater Stats -- 44616
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44616,390,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44616,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44616,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44616,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Weapon - Giant Slayer -- 44621
 	recipecount = recipecount + 1
@@ -1552,8 +1552,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Chest - Super Stats -- 44623
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44623,360,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44623,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44623,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44623,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Gloves - Armsman -- 44625
 	recipecount = recipecount + 1
@@ -1564,14 +1564,14 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Weapon - Exceptional Spellpower -- 44629
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44629,385,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44629,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44629,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44629,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant 2H Weapon - Greater Savagery -- 44630
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44630,380,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44630,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44630,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44630,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Cloak - Shadow Armor -- 44631
 	recipecount = recipecount + 1
@@ -1582,26 +1582,26 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Weapon - Exceptional Agility -- 44633
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44633,400,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44633,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44633,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44633,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Bracers - Greater Spellpower -- 44635
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44635,385,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,44635,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44635,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44635,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Ring - Greater Spellpower -- 44636
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44636,385,nil, 1, 7411)
-	self:addTradeFlags(RecipeDB,44636,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44636,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44636,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Ring - Assault -- 44645
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,44645,385,nil, 1, 7411)
-	self:addTradeFlags(RecipeDB,44645,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,44645,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,44645,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Void Shatter -- 45765
 	recipecount = recipecount + 1
@@ -1636,8 +1636,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Chest - Greater Defense -- 47766
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,47766,390,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,47766,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,47766,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,47766,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Cloak - Greater Speed -- 47898
 	recipecount = recipecount + 1
@@ -1654,8 +1654,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Chest - Super Health -- 47900
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,47900,415,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,47900,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,47900,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,47900,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Boots - Tuskarr's Vitality -- 47901
 	recipecount = recipecount + 1
@@ -1684,62 +1684,62 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Ring - Stamina -- 59636
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,59636,385,nil, 1, 7411)
-	self:addTradeFlags(RecipeDB,59636,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,59636,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,59636,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Boots - Assault -- 60606
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60606,365,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60606,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60606,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,60606,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Cloak - Speed -- 60609
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60609,340,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60609,3,21,22,23,24,25,26,27,28,29,30,36,41,63)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60609,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,63)
+	self:addTradeAcquire(RecipeDB,60609,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Bracers - Striking -- 60616
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60616,350,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60616,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60616,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,60616,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Runed Titanium Rod -- 60619
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60619,425,44452,3,7411)
-	self:addTradeFlags(RecipeDB,60619,3,21,22,23,24,25,26,27,28,29,30,37,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60619,1,2,3,21,22,23,24,25,26,27,28,29,30,37,41)
+	self:addTradeAcquire(RecipeDB,60619,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Weapon - Greater Potency -- 60621
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60621,370,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60621,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60621,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,60621,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Boots - Icewalker -- 60623
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60623,375,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60623,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60623,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,60623,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Shield - Greater Intellect -- 60653
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60653,385,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60653,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60653,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,60653,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Cloak - Major Agility -- 60663
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60663,410,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60663,3,21,22,23,24,25,26,27,28,29,30,36,41,63)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60663,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,63)
+	self:addTradeAcquire(RecipeDB,60663,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant Gloves - Crusher -- 60668
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60668,415,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60668,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60668,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,60668,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 	-- Enchant 2H Weapon - Massacre -- 60691
 	recipecount = recipecount + 1
@@ -1774,8 +1774,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Bracers - Superior Spellpower -- 60767
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,60767,430,nil, 1,7411)
-	self:addTradeFlags(RecipeDB,60767,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,60767,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB,60767,1,26906,1,26954,1,26980,1,26990,1,28693)
 
 
 	return recipecount
diff --git a/RecipeDB/ARL-Engineer.lua b/RecipeDB/ARL-Engineer.lua
index fcc641a..b64a64b 100644
--- a/RecipeDB/ARL-Engineer.lua
+++ b/RecipeDB/ARL-Engineer.lua
@@ -209,7 +209,7 @@ function addon:InitEngineering(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3952,140,4381,1,4036)
 	self:addTradeFlags(RecipeDB,3952,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40,63)
-	self:addTradeAcquire(RecipeDB,3952,2,2682,2,2683,2,3495)
+	self:addTradeAcquire(RecipeDB,3952,2,2683,2,3495)
 
 	-- Bronze Framework -- 3953
 	recipecount = recipecount + 1
@@ -382,7 +382,7 @@ function addon:InitEngineering(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,9269,125,7506,1,4036)
 	self:addTradeFlags(RecipeDB,9269,1,2,4,5,21,22,23,24,25,26,27,28,29,30,36,40,63)
-	self:addTradeAcquire(RecipeDB,9269,3,7800,2,5175)
+	self:addTradeAcquire(RecipeDB,9269,3,7800,2,5175,2,6730)
 
 	-- Aquadynamic Fish Attractor -- 9271
 	recipecount = recipecount + 1
@@ -394,7 +394,7 @@ function addon:InitEngineering(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,9273,165,7148,1,4036)
 	self:addTradeFlags(RecipeDB,9273,1,2,4,5,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,9273,3,7800,2,3537,2,4086)
+	self:addTradeAcquire(RecipeDB,9273,3,7800,2,3134,2,3537)
 
 	-- Gold Power Core -- 12584
 	recipecount = recipecount + 1
@@ -816,26 +816,26 @@ function addon:InitEngineering(RecipeDB)
 	-- Red Firework -- 23066
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,23066,150,9318,1,4036)
-	self:addTradeFlags(RecipeDB,23066,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,23066,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,23066,2,3413)
 
 	-- Blue Firework -- 23067
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,23067,150,9312,1,4036)
-	self:addTradeFlags(RecipeDB,23067,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB,23067,1,4,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeAcquire(RecipeDB,23067,2,5175)
 
 	-- Green Firework -- 23068
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,23068,150,9313,1,4036)
 	self:addTradeFlags(RecipeDB,23068,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,23068,2,3495)
+	self:addTradeAcquire(RecipeDB,23068,2,2838,2,3495)
 
 	-- EZ-Thro Dynamite II -- 23069
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,23069,200,18588,1,4036)
-	self:addTradeFlags(RecipeDB,23069,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,23069,2,8131)
+	self:addTradeFlags(RecipeDB,23069,3,21,22,23,24,25,26,27,28,29,30,36,41)
+	-- No acquire information
 
 	-- Dense Dynamite -- 23070
 	recipecount = recipecount + 1
-- 
1.7.9.5