Quantcast

Removed: Gorgolon the All-seeing, Hch'uu, Nethergarde Engineer, Clintar Dreamwalker, and Ancient Female Vrykul .. from the trainerDB because they aren't even trainers.

pompachomp [10-04-09 - 05:14]
Removed: Gorgolon the All-seeing, Hch'uu, Nethergarde Engineer, Clintar Dreamwalker, and Ancient Female Vrykul .. from the trainerDB because they aren't even trainers.
Removed some incorrect acquire data from the Alchemy database.
Renamed Justin Oshenko to Timofey Oshenko because Blizzard apparently changed that NPCs name.
Corrected the following trainers locations..Waldor: The Barrens->Arathi Highlands, Caryssia Moonhunter: Thousand Needles->Feralas, Anchorite Fateema, Daedal, "Cookie" McWeaksauce: Bloodmyst Isls->Azuremyst Isle, Dalinna: Undercity->Hellfire Peninsula, Orn Tenderhoof: Undercity->Borean Tundra, Awan Iceborn: Silvermoon City->Borean Tundra, Josric Fame: Tirisfal Glades->Dragonblight, Awilo Lon'gomba: Darkshore->Dalaran.
Filename
Locals/testenUS.lua
RecipeDB/ARL-Alchemy.lua
RecipeDB/ARL-Trainer.lua
diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua
index 18e5510..da4ee76 100644
--- a/Locals/testenUS.lua
+++ b/Locals/testenUS.lua
@@ -558,7 +558,6 @@ L["Anchorite Ensham"] = true
 L["Anchorite Fateema"] = true
 L["Anchorite Paetheus"] = true
 L["Anchorite Yazmina"] = true
-L["Ancient Female Vrykul"] = true
 L["Andellion"] = true
 L["Andre Firebeard"] = true
 L["Andrew Hilbert"] = true
@@ -685,7 +684,6 @@ L["Cielstrasza"] = true
 L["Clamlette Surprise"] = true
 L["Clarise Gnarltree"] = true
 L["Cliff Breaker"] = true
-L["Clintar Dreamwalker"] = true
 L["Cloned Ooze"] = true
 L["Clyde Ranthal"] = true
 L["Cobalt Mageweaver"] = true
@@ -914,7 +912,6 @@ L["Gordunni Elementalist"] = true
 L["Gordunni Head-Splitter"] = true
 L["Gordunni Soulreaper"] = true
 L["Goretusk Liver Pie"] = true
-L["Gorgolon the All-seeing"] = true
 L["Graham Van Talen"] = true
 L["Grarnik Goodstitch"] = true
 L["Great-father Winter's Helper"] = true
@@ -946,7 +943,6 @@ L["Harklan Moongrove"] = true
 L["Harlown Darkweave"] = true
 L["Harn Longcast"] = true
 L["Haughty Modiste"] = true
-L["Hch'uu"] = true
 L["Heldan Galesong"] = true
 L["Helenia Olden"] = true
 L["Hgarth"] = true
@@ -1016,7 +1012,7 @@ L["Joys of Omosh"] = true
 L["Jubie Gadgetspring"] = true
 L["Jun'ha"] = true
 L["Juno Dufrain"] = true
-L["Justin Oshenko"] = true
+L["Timofey Oshenko"] = true
 L["Jutak"] = true
 L["K. Lee Smallfry"] = true
 L["Kaita Deepforge"] = true
@@ -1203,7 +1199,6 @@ L["Nemiha"] = true
 L["Nergal"] = true
 L["Nerrist"] = true
 L["Nessa Shadowsong"] = true
-L["Nethergarde Engineer"] = true
 L["Nexus Stalker"] = true
 L["Nimar the Slayer"] = true
 L["Nina Lightbrew"] = true
diff --git a/RecipeDB/ARL-Alchemy.lua b/RecipeDB/ARL-Alchemy.lua
index 5fc1138..3c38744 100644
--- a/RecipeDB/ARL-Alchemy.lua
+++ b/RecipeDB/ARL-Alchemy.lua
@@ -695,7 +695,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- Elixir of Camouflage -- 28543
 	self:addTradeSkill(RecipeDB,28543,305,22823,1,51304,nil,1,305,320,327,335)
 	self:addTradeFlags(RecipeDB,28543,1,2,3,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,28543,1,22823,2,16588,2,16641,2,16705,2,18802)
+	self:addTradeAcquire(RecipeDB,28543,2,16588,2,16641,2,16705,2,18802)

 	-- Elixir of Major Strength -- 28544
 	self:addTradeSkill(RecipeDB,28544,305,22824,1,51304,nil,1,305,320,327,335)
@@ -717,7 +717,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- Elixir of Major Frost Power -- 28549
 	self:addTradeSkill(RecipeDB,28549,320,22827,1,51304,nil,1,320,335,342,350)
 	self:addTradeFlags(RecipeDB,28549,1,2,3,4,21,22,23,24,25,26,27,28,29,30,36,40,53,54)
-	self:addTradeAcquire(RecipeDB,28549,1,22827,2,18005,2,18017)
+	self:addTradeAcquire(RecipeDB,28549,2,18005,2,18017)

 	-- Insane Strength Potion -- 28550
 	self:addTradeSkill(RecipeDB,28550,320,22828,2,51304,nil,1,320,335,342,350)
@@ -759,7 +759,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- Elixir of Major Defense -- 28557
 	self:addTradeSkill(RecipeDB,28557,345,22834,1,51304,nil,1,345,360,367,375)
 	self:addTradeFlags(RecipeDB,28557,1,2,3,4,21,22,23,24,25,26,27,28,29,30,36,40,52)
-	self:addTradeAcquire(RecipeDB,28557,1,22834,2,18005,2,19837)
+	self:addTradeAcquire(RecipeDB,28557,2,18005,2,19837)

 	-- Elixir of Major Shadow Power -- 28558
 	self:addTradeSkill(RecipeDB,28558,350,22835,2,51304,nil,1,350,365,372,380)
diff --git a/RecipeDB/ARL-Trainer.lua b/RecipeDB/ARL-Trainer.lua
index a9af28d..c1f9b5d 100644
--- a/RecipeDB/ARL-Trainer.lua
+++ b/RecipeDB/ARL-Trainer.lua
@@ -118,303 +118,298 @@ function addon:InitTrainer(TrainerDB)
 	self:addLookupList(TrainerDB,3704,L["Mahani"],BZ["The Barrens"],44.9,59.4,2)
 	self:addLookupList(TrainerDB,3964,L["Kylanna"],BZ["Ashenvale"],50.8,67.1,1)
 	self:addLookupList(TrainerDB,3967,L["Aayndia Floralwind"],BZ["Ashenvale"],35.9,52.1,1)
-	self:addLookupList(TrainerDB,4159,L["Me'lynn"],BZ["Darnassus"],63.06,22.89,1)  -----START HERE
-	self:addLookupList(TrainerDB,4160,L["Ainethil"],BZ["Darnassus"],55.16,23.60,1)
-	self:addLookupList(TrainerDB,4193,L["Grondal Moonbreeze"],BZ["Darkshore"],37.78,40.87,1)
-	self:addLookupList(TrainerDB,4210,L["Alegorn"],BZ["Darnassus"],49.50,21.21,1)
-	self:addLookupList(TrainerDB,4211,L["Dannelor"],BZ["Darnassus"],52.04,13.34,1)
-	self:addLookupList(TrainerDB,4212,L["Telonis"],BZ["Darnassus"],64.30,21.94,1)
-	self:addLookupList(TrainerDB,4213,L["Taladan"],BZ["Darnassus"],59.35,13.50,1)
-	self:addLookupList(TrainerDB,4254,L["Geofram Bouldertoe"],BZ["Ironforge"],51.03,26.92,1)
-	self:addLookupList(TrainerDB,4258,L["Bengus Deepforge"],BZ["Ironforge"],52.74,41.50,1)
-	self:addLookupList(TrainerDB,4552,L["Eunice Burch"],BZ["Undercity"],63.43,43.83,2)
-	self:addLookupList(TrainerDB,4576,L["Josef Gregorian"],BZ["Undercity"],70.95,30.52,2)
-	self:addLookupList(TrainerDB,4578,L["Josephine Lister"],BZ["Undercity"],86.66,22.10,2)
-	self:addLookupList(TrainerDB,4586,L["Graham Van Talen"],BZ["Undercity"],76.42,73.38,2)
-	self:addLookupList(TrainerDB,4588,L["Arthur Moore"],BZ["Undercity"],71.10,58.42,2)
-	self:addLookupList(TrainerDB,4591,L["Mary Edras"],BZ["Undercity"],74.04,57.91,2)
-	self:addLookupList(TrainerDB,4596,L["James Van Brunt"],BZ["Undercity"],61.75,29.83,2)
-	self:addLookupList(TrainerDB,4598,L["Brom Killian"],BZ["Undercity"],56.05,36.01,2)
-	self:addLookupList(TrainerDB,4605,L["Basil Frye"],BZ["Undercity"],60.04,29.03,2)
-	self:addLookupList(TrainerDB,4609,L["Doctor Marsh"],BZ["Undercity"],53.00,73.92,2)
-	self:addLookupList(TrainerDB,4611,L["Doctor Herbert Halsey"],BZ["Undercity"],47.92,72.83,2)
+	self:addLookupList(TrainerDB,4159,L["Me'lynn"],BZ["Darnassus"],61.7,23.0,1)  ----
+	self:addLookupList(TrainerDB,4160,L["Ainethil"],BZ["Darnassus"],55.0,23.8,1)
+	self:addLookupList(TrainerDB,4193,L["Grondal Moonbreeze"],BZ["Darkshore"],38.2,40.5,1)
+	self:addLookupList(TrainerDB,4210,L["Alegorn"],BZ["Darnassus"],49.2,21.2,1)
+	self:addLookupList(TrainerDB,4211,L["Dannelor"],BZ["Darnassus"],51.7,12.6,1)
+	self:addLookupList(TrainerDB,4212,L["Telonis"],BZ["Darnassus"],64.5,21.3,1)
+	self:addLookupList(TrainerDB,4213,L["Taladan"],BZ["Darnassus"],58.6,13.2,1)
+	self:addLookupList(TrainerDB,4254,L["Geofram Bouldertoe"],BZ["Ironforge"],50.3,26.0,1)
+	self:addLookupList(TrainerDB,4258,L["Bengus Deepforge"],BZ["Ironforge"],51.0,43.0,1)
+	self:addLookupList(TrainerDB,4552,L["Eunice Burch"],BZ["Undercity"],62.3,44.6,2)
+	self:addLookupList(TrainerDB,4576,L["Josef Gregorian"],BZ["Undercity"],70.7,30.3,2)
+	self:addLookupList(TrainerDB,4578,L["Josephine Lister"],BZ["Undercity"],86.5,22.3,2)
+	self:addLookupList(TrainerDB,4586,L["Graham Van Talen"],BZ["Undercity"],76.42,73.38,2)  -----hmmm
+	self:addLookupList(TrainerDB,4588,L["Arthur Moore"],BZ["Undercity"],70.3,58.5,2)
+	self:addLookupList(TrainerDB,4591,L["Mary Edras"],BZ["Undercity"],73.5,54.8,2)
+	self:addLookupList(TrainerDB,4596,L["James Van Brunt"],BZ["Undercity"],61.2,29.9,2)
+	self:addLookupList(TrainerDB,4598,L["Brom Killian"],BZ["Undercity"],55.8,37.0,2)
+	self:addLookupList(TrainerDB,4605,L["Basil Frye"],BZ["Undercity"],60.04,29.03,2)   ---- hmm
+	self:addLookupList(TrainerDB,4609,L["Doctor Marsh"],BZ["Undercity"],51.0,75.1,2)  ---- hmmm
+	self:addLookupList(TrainerDB,4611,L["Doctor Herbert Halsey"],BZ["Undercity"],47.7,73.0,2)
 	self:addLookupList(TrainerDB,4616,L["Lavinia Crowe"],BZ["Undercity"],62.1,60.5,2)
 	self:addLookupList(TrainerDB,4900,L["Alchemist Narett"],BZ["Dustwallow Marsh"],64.0,47.7,1)
-	self:addLookupList(TrainerDB,5127,L["Fimble Finespindle"],BZ["Ironforge"],40.00,33.72,1)
-	self:addLookupList(TrainerDB,5150,L["Nissa Firestone"],BZ["Ironforge"],54.79,59.79,1)
-	self:addLookupList(TrainerDB,5153,L["Jormund Stonebrow"],BZ["Ironforge"],43.67,28.95,1)
+	self:addLookupList(TrainerDB,5127,L["Fimble Finespindle"],BZ["Ironforge"],39.8,33.5,1)
+	self:addLookupList(TrainerDB,5150,L["Nissa Firestone"],BZ["Ironforge"],54.0,57.8,1)
+	self:addLookupList(TrainerDB,5153,L["Jormund Stonebrow"],BZ["Ironforge"],43.2,29.0,1)
 	self:addLookupList(TrainerDB,5157,L["Gimble Thistlefuzz"],BZ["Ironforge"],60.0,45.4,1)
-	self:addLookupList(TrainerDB,5159,L["Daryl Riknussun"],BZ["Ironforge"],60.71,37.93,1)
-	self:addLookupList(TrainerDB,5164,L["Grumnus Steelshaper"],BZ["Ironforge"],50.85,43.13,1)
-	self:addLookupList(TrainerDB,5174,L["Springspindle Fizzlegear"],BZ["Ironforge"],68.81,45.12,1)
-	self:addLookupList(TrainerDB,5177,L["Tally Berryfizz"],BZ["Ironforge"],67.10,54.88,1)
-	self:addLookupList(TrainerDB,5392,L["Yarr Hammerstone"],BZ["Dun Morogh"],50.64,49.96,1)
-	self:addLookupList(TrainerDB,5482,L["Stephen Ryback"],BZ["Stormwind City"],78.03,53.24,1)
+	self:addLookupList(TrainerDB,5159,L["Daryl Riknussun"],BZ["Ironforge"],60.1,36.8,1)
+	self:addLookupList(TrainerDB,5164,L["Grumnus Steelshaper"],BZ["Ironforge"],50.2,42.8,1)
+	self:addLookupList(TrainerDB,5174,L["Springspindle Fizzlegear"],BZ["Ironforge"],68.4,44.0,1)
+	self:addLookupList(TrainerDB,5177,L["Tally Berryfizz"],BZ["Ironforge"],66.6,55.2,1)
+	self:addLookupList(TrainerDB,5392,L["Yarr Hammerstone"],BZ["Dun Morogh"],50.0,50.3,1)
+	self:addLookupList(TrainerDB,5482,L["Stephen Ryback"],BZ["Stormwind City"],78.2,53.2,1)
 	self:addLookupList(TrainerDB,5499,L["Lilyssia Nightbreeze"],BZ["Stormwind City"],55.6,85.9,1)
-	self:addLookupList(TrainerDB,5500,L["Tel'Athir"],BZ["Stormwind City"],55.97,85.37,1)
-	self:addLookupList(TrainerDB,5511,L["Therum Deepforge"],BZ["Stormwind City"],63.95,38.11,1)
-	self:addLookupList(TrainerDB,5513,L["Gelman Stonehand"],BZ["Stormwind City"],59.16,38.21,1)
-	self:addLookupList(TrainerDB,5518,L["Lilliam Sparkspindle"],BZ["Stormwind City"],62.27,31.06,1)
-	self:addLookupList(TrainerDB,5564,L["Simon Tanner"],BZ["Stormwind City"],71.85,62.41,1)
-	self:addLookupList(TrainerDB,5567,L["Sellandus"],BZ["Stormwind City"],52.11,82.95,1)
+	self:addLookupList(TrainerDB,5500,L["Tel'Athir"],BZ["Stormwind City"],55.97,85.37,1)   ------ hmm
+	self:addLookupList(TrainerDB,5511,L["Therum Deepforge"],BZ["Stormwind City"],63.9,37.8,1)
+	self:addLookupList(TrainerDB,5513,L["Gelman Stonehand"],BZ["Stormwind City"],59.2,37.7,1)
+	self:addLookupList(TrainerDB,5518,L["Lilliam Sparkspindle"],BZ["Stormwind City"],62.2,30.5,1)
+	self:addLookupList(TrainerDB,5564,L["Simon Tanner"],BZ["Stormwind City"],71.8,62.9,1)
+	self:addLookupList(TrainerDB,5567,L["Sellandus"],BZ["Stormwind City"],52.11,82.95,1)  ----- hmmm
 	self:addLookupList(TrainerDB,5695,L["Vance Undergloom"],BZ["Tirisfal Glades"],61.7,51.6,2)
-	self:addLookupList(TrainerDB,5759,L["Nurse Neela"],BZ["Tirisfal Glades"],62.18,51.90,2)
-	self:addLookupList(TrainerDB,5784,L["Waldor"],BZ["The Barrens"],46.20,36.68,0)
-	self:addLookupList(TrainerDB,5811,L["Kamari"],BZ["Orgrimmar"],63.23,45.00,2)
-	self:addLookupList(TrainerDB,5939,L["Vira Younghoof"],BZ["Mulgore"],46.73,60.83,2)
-	self:addLookupList(TrainerDB,5943,L["Rawrk"],BZ["Durotar"],53.90,42.99,2)
-	self:addLookupList(TrainerDB,5997,L["Nethergarde Engineer"],BZ["Blasted Lands"],61.60,7.438,1)
-	self:addLookupList(TrainerDB,6094,L["Byancie"],BZ["Teldrassil"],55.61,57.18,1)
-	self:addLookupList(TrainerDB,6286,L["Zarrin"],BZ["Teldrassil"],57.59,61.60,1)
-	self:addLookupList(TrainerDB,6297,L["Kurdram Stonehammer"],BZ["Darkshore"],37.82,41.04,1)
+	self:addLookupList(TrainerDB,5759,L["Nurse Neela"],BZ["Tirisfal Glades"],61.8,52.8,2)
+	self:addLookupList(TrainerDB,5784,L["Waldor"],BZ["Arathi Highlands"],32.6,28.5,0) --- confirm
+	self:addLookupList(TrainerDB,5811,L["Kamari"],BZ["Orgrimmar"],63.23,45.00,2) ---- hmm
+	self:addLookupList(TrainerDB,5939,L["Vira Younghoof"],BZ["Mulgore"],46.8,60.8,2)
+	self:addLookupList(TrainerDB,5943,L["Rawrk"],BZ["Durotar"],54.1,42.0,2)
+	self:addLookupList(TrainerDB,6094,L["Byancie"],BZ["Teldrassil"],55.3,56.8,1)
+	self:addLookupList(TrainerDB,6286,L["Zarrin"],BZ["Teldrassil"],57.1,61.3,1)
+	self:addLookupList(TrainerDB,6297,L["Kurdram Stonehammer"],BZ["Darkshore"],38.2,41.1,1)
 	self:addLookupList(TrainerDB,6299,L["Delfrum Flintbeard"],BZ["Darkshore"],38.2,41.0,1)
-	self:addLookupList(TrainerDB,7230,L["Shayis Steelfury"],BZ["Orgrimmar"],80.44,25.05,2)
-	self:addLookupList(TrainerDB,7231,L["Kelgruk Bloodaxe"],BZ["Orgrimmar"],82.08,22.93,2)
-	self:addLookupList(TrainerDB,7232,L["Borgus Steelhand"],BZ["Stormwind City"],59.94,35.05,1)
-	self:addLookupList(TrainerDB,7406,L["Oglethorpe Obnoticus"],BZ["Stranglethorn Vale"],28.36,76.34,0)
-	self:addLookupList(TrainerDB,7866,L["Peter Galen"],BZ["Azshara"],36.94,66.15,1)
-	self:addLookupList(TrainerDB,7867,L["Thorkaf Dragoneye"],BZ["Badlands"],62.18,57.74,2)
-	self:addLookupList(TrainerDB,7868,L["Sarah Tanner"],BZ["Searing Gorge"],63.39,75.27,1)
-	self:addLookupList(TrainerDB,7869,L["Brumn Winterhoof"],BZ["Arathi Highlands"],28.48,44.31,2)
-	self:addLookupList(TrainerDB,7870,L["Caryssia Moonhunter"],BZ["Thousand Needles"],9.022,18.79,1)
-	self:addLookupList(TrainerDB,7871,L["Se'Jib"],BZ["Stranglethorn Vale"],37.14,34.67,2)
-	self:addLookupList(TrainerDB,7944,L["Tinkmaster Overspark"],BZ["Ironforge"],70.61,50.32,1)
-	self:addLookupList(TrainerDB,7948,L["Kylanna Windwhisper"],BZ["Feralas"],32.03,44.10,1)
+	self:addLookupList(TrainerDB,7230,L["Shayis Steelfury"],BZ["Orgrimmar"],80.3,23.2,2)
+	self:addLookupList(TrainerDB,7231,L["Kelgruk Bloodaxe"],BZ["Orgrimmar"],81.9,18.3,2)
+	self:addLookupList(TrainerDB,7232,L["Borgus Steelhand"],BZ["Stormwind City"],59.8,34.8,1)
+	self:addLookupList(TrainerDB,7406,L["Oglethorpe Obnoticus"],BZ["Stranglethorn Vale"],28.3,76.3,0)
+	self:addLookupList(TrainerDB,7866,L["Peter Galen"],BZ["Azshara"],37.5,65.5,1)
+	self:addLookupList(TrainerDB,7867,L["Thorkaf Dragoneye"],BZ["Badlands"],62.6,57.6,2)
+	self:addLookupList(TrainerDB,7868,L["Sarah Tanner"],BZ["Searing Gorge"],63.7,75.7,1)
+	self:addLookupList(TrainerDB,7869,L["Brumn Winterhoof"],BZ["Arathi Highlands"],28.2,45.0,2)
+	self:addLookupList(TrainerDB,7870,L["Caryssia Moonhunter"],BZ["Feralas"],89.4,46.5,1)  ---confirm
+	self:addLookupList(TrainerDB,7871,L["Se'Jib"],BZ["Stranglethorn Vale"],36.6,34.2,2)
+	self:addLookupList(TrainerDB,7944,L["Tinkmaster Overspark"],BZ["Ironforge"],69.8,50.0,1)
+	self:addLookupList(TrainerDB,7948,L["Kylanna Windwhisper"],BZ["Feralas"],32.6,43.8,1)
 	self:addLookupList(TrainerDB,7949,L["Xylinnia Starshine"],BZ["Feralas"],31.6,44.3,1)
-	self:addLookupList(TrainerDB,8126,L["Nixx Sprocketspring"],BZ["Tanaris"],52.03,27.00,0)
-	self:addLookupList(TrainerDB,8128,L["Pikkle"],BZ["Tanaris"],50.82,28.75,0)
-	self:addLookupList(TrainerDB,8153,L["Narv Hidecrafter"],BZ["Desolace"],55.61,55.62,2)
-	self:addLookupList(TrainerDB,8306,L["Duhng"],BZ["The Barrens"],55.19,32.20,2)
-	self:addLookupList(TrainerDB,8736,L["Buzzek Bracketswing"],BZ["Tanaris"],52.43,28.98,0)
-	self:addLookupList(TrainerDB,8738,L["Vazario Linkgrease"],BZ["The Barrens"],63.32,35.98,0)
-	self:addLookupList(TrainerDB,9584,L["Jalane Ayrole"],BZ["Stormwind City"],40.05,84.76,1)
-	self:addLookupList(TrainerDB,10266,L["Ug'thok"],BZ["Orgrimmar"],80.26,23.88,2)
-	self:addLookupList(TrainerDB,10276,L["Rotgath Stonebeard"],BZ["Ironforge"],51.85,43.16,1)
-	self:addLookupList(TrainerDB,10277,L["Groum Stonebeard"],BZ["Ironforge"],51.92,42.30,1)
-	self:addLookupList(TrainerDB,10278,L["Thrag Stonehoof"],BZ["Thunder Bluff"],40.20,57.08,2)
-	self:addLookupList(TrainerDB,11017,L["Roxxik"],BZ["Orgrimmar"],75.85,22.68,2)
+	self:addLookupList(TrainerDB,8126,L["Nixx Sprocketspring"],BZ["Tanaris"],52.5,27.3,0)
+	self:addLookupList(TrainerDB,8128,L["Pikkle"],BZ["Tanaris"],51.1,28.1,0)
+	self:addLookupList(TrainerDB,8153,L["Narv Hidecrafter"],BZ["Desolace"],55.3,56.3,2)
+	self:addLookupList(TrainerDB,8306,L["Duhng"],BZ["The Barrens"],55.3,31.8,2)
+	self:addLookupList(TrainerDB,8736,L["Buzzek Bracketswing"],BZ["Tanaris"],52.3,27.7,0)
+	self:addLookupList(TrainerDB,8738,L["Vazario Linkgrease"],BZ["The Barrens"],62.7,36.3,0)
+	self:addLookupList(TrainerDB,9584,L["Jalane Ayrole"],BZ["Stormwind City"],40.6,83.9,1)
+	self:addLookupList(TrainerDB,10266,L["Ug'thok"],BZ["Orgrimmar"],80.26,23.88,2) ---- hmmmmmm
+	self:addLookupList(TrainerDB,10276,L["Rotgath Stonebeard"],BZ["Ironforge"],51.85,43.16,1) --- hmmmmm
+	self:addLookupList(TrainerDB,10277,L["Groum Stonebeard"],BZ["Ironforge"],51.92,42.30,1)  --- hmmmm
+	self:addLookupList(TrainerDB,10278,L["Thrag Stonehoof"],BZ["Thunder Bluff"],40.20,57.08,2)  --- hmmm
+	self:addLookupList(TrainerDB,11017,L["Roxxik"],BZ["Orgrimmar"],76.0,25.1,2)
 	self:addLookupList(TrainerDB,11025,L["Mukdrak"],BZ["Durotar"],52.2,40.8,2)
-	self:addLookupList(TrainerDB,11026,L["Sprite Jumpsprocket"],BZ["Stormwind City"],62.40,31.40,1)
-	self:addLookupList(TrainerDB,11028,L["Jemma Quikswitch"],BZ["Ironforge"],68.80,44.46,1)
-	self:addLookupList(TrainerDB,11029,L["Trixie Quikswitch"],BZ["Ironforge"],68.84,45.50,1)
+	self:addLookupList(TrainerDB,11026,L["Sprite Jumpsprocket"],BZ["Stormwind City"],62.1,30.4,1)  --- hmmm
+	self:addLookupList(TrainerDB,11028,L["Jemma Quikswitch"],BZ["Ironforge"],68.80,44.46,1)  ----- hmmmm
+	self:addLookupList(TrainerDB,11029,L["Trixie Quikswitch"],BZ["Ironforge"],68.84,45.50,1) ----- hmmm
 	self:addLookupList(TrainerDB,11031,L["Franklin Lloyd"],BZ["Undercity"],75.9,73.7,2)
 	self:addLookupList(TrainerDB,11037,L["Jenna Lemkenilli"],BZ["Darkshore"],38.3,41.1,1)
-	self:addLookupList(TrainerDB,11041,L["Milla Fairancora"],BZ["Darnassus"],54.64,22.04,1)
-	self:addLookupList(TrainerDB,11042,L["Sylvanna Forestmoon"],BZ["Darnassus"],55.83,24.74,1)
-	self:addLookupList(TrainerDB,11044,L["Doctor Martin Felben"],BZ["Undercity"],47.05,74.58,2)
-	self:addLookupList(TrainerDB,11046,L["Whuut"],BZ["Orgrimmar"],56.40,34.46,2)
-	self:addLookupList(TrainerDB,11047,L["Kray"],BZ["Thunder Bluff"],47.75,34.77,2)
-	self:addLookupList(TrainerDB,11048,L["Victor Ward"],BZ["Undercity"],71.38,29.90,2)
-	self:addLookupList(TrainerDB,11049,L["Rhiannon Davis"],BZ["Undercity"],71.16,30.08,2)
-	self:addLookupList(TrainerDB,11050,L["Trianna"],BZ["Darnassus"],63.22,23.05,1)
-	self:addLookupList(TrainerDB,11051,L["Vhan"],BZ["Thunder Bluff"],43.91,44.51,2)
-	self:addLookupList(TrainerDB,11052,L["Timothy Worthington"],BZ["Dustwallow Marsh"],65.82,50.98,1)
-	self:addLookupList(TrainerDB,11065,L["Thonys Pillarstone"],BZ["Ironforge"],60.64,44.86,1)
-	self:addLookupList(TrainerDB,11066,L["Jhag"],BZ["Orgrimmar"],53.82,38.74,2)
-	self:addLookupList(TrainerDB,11067,L["Malcomb Wynn"],BZ["Undercity"],61.37,61.52,2)
-	self:addLookupList(TrainerDB,11068,L["Betty Quin"],BZ["Stormwind City"],52.95,73.89,1)
-	self:addLookupList(TrainerDB,11070,L["Lalina Summermoon"],BZ["Darnassus"],59.76,13.56,1)
-	self:addLookupList(TrainerDB,11071,L["Mot Dawnstrider"],BZ["Thunder Bluff"],45.61,40.65,2)
-	self:addLookupList(TrainerDB,11072,L["Kitta Firewind"],BZ["Elwynn Forest"],65.28,69.98,1)
+	self:addLookupList(TrainerDB,11041,L["Milla Fairancora"],BZ["Darnassus"],54.64,22.04,1) --- hmmm
+	self:addLookupList(TrainerDB,11042,L["Sylvanna Forestmoon"],BZ["Darnassus"],55.83,24.74,1) --- hmmm
+	self:addLookupList(TrainerDB,11044,L["Doctor Martin Felben"],BZ["Undercity"],47.05,74.58,2)  --- hmmmm
+	self:addLookupList(TrainerDB,11046,L["Whuut"],BZ["Orgrimmar"],56.40,34.46,2)  ------ hmm
+	self:addLookupList(TrainerDB,11047,L["Kray"],BZ["Thunder Bluff"],47.75,34.77,2)  ----- hmmm
+	self:addLookupList(TrainerDB,11048,L["Victor Ward"],BZ["Undercity"],71.38,29.90,2)  ---- hmmm
+	self:addLookupList(TrainerDB,11049,L["Rhiannon Davis"],BZ["Undercity"],71.16,30.08,2) ---- hmmmm
+	self:addLookupList(TrainerDB,11050,L["Trianna"],BZ["Darnassus"],63.22,23.05,1)  --- hmmm
+	self:addLookupList(TrainerDB,11051,L["Vhan"],BZ["Thunder Bluff"],43.91,44.51,2) --- hmmm
+	self:addLookupList(TrainerDB,11052,L["Timothy Worthington"],BZ["Dustwallow Marsh"],66.22,51.7,1)
+	self:addLookupList(TrainerDB,11065,L["Thonys Pillarstone"],BZ["Ironforge"],60.64,44.86,1)  ---- hmmm
+	self:addLookupList(TrainerDB,11066,L["Jhag"],BZ["Orgrimmar"],53.82,38.74,2) ---- hmmm
+	self:addLookupList(TrainerDB,11067,L["Malcomb Wynn"],BZ["Undercity"],61.37,61.52,2)  --- hmmm
+	self:addLookupList(TrainerDB,11068,L["Betty Quin"],BZ["Stormwind City"],52.95,73.89,1) --- hmmm
+	self:addLookupList(TrainerDB,11070,L["Lalina Summermoon"],BZ["Darnassus"],59.76,13.56,1)  ---- hmmm
+	self:addLookupList(TrainerDB,11071,L["Mot Dawnstrider"],BZ["Thunder Bluff"],45.61,40.65,2) --- hmmm
+	self:addLookupList(TrainerDB,11072,L["Kitta Firewind"],BZ["Elwynn Forest"],64.9,70.6,1)
 	self:addLookupList(TrainerDB,11073,L["Annora"],BZ["Uldaman"],0,0,0)
 	self:addLookupList(TrainerDB,11074,L["Hgarth"],BZ["Stonetalon Mountains"],49.2,57.2,2)
-	self:addLookupList(TrainerDB,11081,L["Faldron"],BZ["Darnassus"],64.59,21.48,1)
-	self:addLookupList(TrainerDB,11083,L["Darianna"],BZ["Darnassus"],64.93,22.22,1)
-	self:addLookupList(TrainerDB,11084,L["Tarn"],BZ["Thunder Bluff"],43.23,43.24,2)
-	self:addLookupList(TrainerDB,11096,L["Randal Worth"],BZ["Stormwind City"],72.12,60.72,1)
-	self:addLookupList(TrainerDB,11097,L["Drakk Stonehand"],BZ["The Hinterlands"],13.51,43.35,1)
-	self:addLookupList(TrainerDB,11098,L["Hahrana Ironhide"],BZ["Feralas"],75.03,42.87,2)
-	self:addLookupList(TrainerDB,11146,L["Ironus Coldsteel"],BZ["Ironforge"],50.93,43.54,1)
-	self:addLookupList(TrainerDB,11177,L["Okothos Ironrager"],BZ["Orgrimmar"],80.41,23.92,2)
-	self:addLookupList(TrainerDB,11178,L["Borgosh Corebender"],BZ["Orgrimmar"],80.18,25.01,2)
-	self:addLookupList(TrainerDB,11557,L["Meilosh"],BZ["Felwood"],66.25,2.961,2)
-	self:addLookupList(TrainerDB,12920,L["Doctor Gregory Victor"],BZ["Arathi Highlands"],72.97,35.39,2)
-	self:addLookupList(TrainerDB,12939,L["Doctor Gustaf VanHowzen"],BZ["Dustwallow Marsh"],68.18,47.94,1)
+	self:addLookupList(TrainerDB,11081,L["Faldron"],BZ["Darnassus"],63.5,22.2,1) --- hmmm
+	self:addLookupList(TrainerDB,11083,L["Darianna"],BZ["Darnassus"],64.93,22.22,1)  --- hmmm
+	self:addLookupList(TrainerDB,11084,L["Tarn"],BZ["Thunder Bluff"],43.23,43.24,2)  --- hmmm
+	self:addLookupList(TrainerDB,11096,L["Randal Worth"],BZ["Stormwind City"],72.12,60.72,1) --- hmmm
+	self:addLookupList(TrainerDB,11097,L["Drakk Stonehand"],BZ["The Hinterlands"],13.4,43.4,1)
+	self:addLookupList(TrainerDB,11098,L["Hahrana Ironhide"],BZ["Feralas"],74.4,43.1,2)
+	self:addLookupList(TrainerDB,11146,L["Ironus Coldsteel"],BZ["Ironforge"],50.5,43.3,1)
+	self:addLookupList(TrainerDB,11177,L["Okothos Ironrager"],BZ["Orgrimmar"],79.8,23.8,2)
+	self:addLookupList(TrainerDB,11178,L["Borgosh Corebender"],BZ["Orgrimmar"],79.7,23.7,2)
+	self:addLookupList(TrainerDB,11557,L["Meilosh"],BZ["Felwood"],65.7,2.9,2)
+	self:addLookupList(TrainerDB,12920,L["Doctor Gregory Victor"],BZ["Arathi Highlands"],73.4,36.8,2) -----IS HE REAALLY THERE TEACHING?
+	self:addLookupList(TrainerDB,12939,L["Doctor Gustaf VanHowzen"],BZ["Dustwallow Marsh"],68.18,47.94,1)    -----IS HE REAALLY THERE TEACHING?
 	self:addLookupList(TrainerDB,15400,L["Arathel Sunforge"],BZ["Eversong Woods"],59.6,62.6,2)
-	self:addLookupList(TrainerDB,15501,L["Aleinia"],BZ["Eversong Woods"],47.86,48.02,2)
+	self:addLookupList(TrainerDB,15501,L["Aleinia"],BZ["Eversong Woods"],48.5,47.5,2)
 	self:addLookupList(TrainerDB,16160,L["Magistrix Eredania"],BZ["Eversong Woods"],38.2,72.6,2)
 	self:addLookupList(TrainerDB,16161,L["Arcanist Sheynathren"],BZ["Eversong Woods"],38.2,72.5,2)
-	self:addLookupList(TrainerDB,16253,L["Master Chef Mouldier"],BZ["Ghostlands"],47.88,31.20,2)
-	self:addLookupList(TrainerDB,16272,L["Kanaria"],BZ["Eversong Woods"],48.99,46.98,2)
-	self:addLookupList(TrainerDB,16277,L["Quarelestra"],BZ["Eversong Woods"],49.03,46.93,2)
-	self:addLookupList(TrainerDB,16278,L["Sathein"],BZ["Eversong Woods"],53.72,51.99,2)
-	self:addLookupList(TrainerDB,16366,L["Sempstress Ambershine"],BZ["Eversong Woods"],37.33,72.34,2)
-	self:addLookupList(TrainerDB,16583,L["Rohok"],BZ["Hellfire Peninsula"],53.04,38.25,2)
-	self:addLookupList(TrainerDB,16588,L["Apothecary Antonivich"],BZ["Hellfire Peninsula"],52.40,35.83,2)
-	self:addLookupList(TrainerDB,16633,L["Sedana"],BZ["Silvermoon City"],69.84,25.54,2)
-	self:addLookupList(TrainerDB,16634,L["Dolothos"],BZ["Silvermoon City"],68.63,25.56,2)
-	self:addLookupList(TrainerDB,16639,L["Galana"],BZ["Silvermoon City"],57.26,50.32,2)
-	self:addLookupList(TrainerDB,16640,L["Keelen Sheets"],BZ["Silvermoon City"],56.84,50.20,2)
-	self:addLookupList(TrainerDB,16642,L["Camberon"],BZ["Silvermoon City"],66.87,17.10,2)
-	self:addLookupList(TrainerDB,16643,L["Razia"],BZ["Silvermoon City"],67.00,18.33,2)
-	self:addLookupList(TrainerDB,16662,L["Alestus"],BZ["Silvermoon City"],77.87,72.65,2)
-	self:addLookupList(TrainerDB,16663,L["Belil"],BZ["Silvermoon City"],79.25,41.45,2)
-	self:addLookupList(TrainerDB,16667,L["Danwe"],BZ["Silvermoon City"],76.71,40.62,2)
-	self:addLookupList(TrainerDB,16668,L["Gloresse"],BZ["Silvermoon City"],75.97,39.63,2)
-	self:addLookupList(TrainerDB,16669,L["Bemarrin"],BZ["Silvermoon City"],80.12,38.95,2)
-	self:addLookupList(TrainerDB,16671,L["Mirvedon"],BZ["Silvermoon City"],79.95,35.89,2)
-	self:addLookupList(TrainerDB,16676,L["Sylann"],BZ["Silvermoon City"],69.42,70.98,2)
-	self:addLookupList(TrainerDB,16687,L["Talmar"],BZ["Silvermoon City"],83.16,81.18,2)
-	self:addLookupList(TrainerDB,16688,L["Lynalis"],BZ["Silvermoon City"],83.79,81.65,2)
-	self:addLookupList(TrainerDB,16703,L["Amin"],BZ["Silvermoon City"],90.36,75.05,2)
-	self:addLookupList(TrainerDB,16719,L["Mumman"],BZ["The Exodar"],56.70,28.60,1)
-	self:addLookupList(TrainerDB,16723,L["Lucc"],BZ["The Exodar"],28.66,61.83,1)
-	self:addLookupList(TrainerDB,16724,L["Miall"],BZ["The Exodar"],60.77,89.26,1)
-	self:addLookupList(TrainerDB,16725,L["Nahogg"],BZ["The Exodar"],41.11,39.45,1)
-	self:addLookupList(TrainerDB,16726,L["Ockil"],BZ["The Exodar"],55.15,91.81,1)
-	self:addLookupList(TrainerDB,16727,L["Padaar"],BZ["The Exodar"],44.68,25.50,1)
-	self:addLookupList(TrainerDB,16728,L["Akham"],BZ["The Exodar"],66.53,74.65,1)
-	self:addLookupList(TrainerDB,16729,L["Refik"],BZ["The Exodar"],63.24,67.89,1)
-	self:addLookupList(TrainerDB,16731,L["Nus"],BZ["The Exodar"],40.38,24.25,1)
-	self:addLookupList(TrainerDB,16740,L["Edrem"],BZ["The Exodar"],60.76,87.74,1)
-	self:addLookupList(TrainerDB,16741,L["Deriz"],BZ["The Exodar"],28.91,61.55,1)
-	self:addLookupList(TrainerDB,16742,L["Kudrii"],BZ["The Exodar"],39.74,39.20,1)
-	self:addLookupList(TrainerDB,16743,L["Ghermas"],BZ["The Exodar"],56.00,90.54,1)
-	self:addLookupList(TrainerDB,16745,L["Feruul"],BZ["The Exodar"],66.36,74.54,1)
-	self:addLookupList(TrainerDB,16746,L["Kayaart"],BZ["The Exodar"],63.14,68.63,1)
-	self:addLookupList(TrainerDB,16752,L["Muaat"],BZ["The Exodar"],60.42,87.93,1)
-	self:addLookupList(TrainerDB,16823,L["Humphry"],BZ["Hellfire Peninsula"],57.20,64.44,1)
-	self:addLookupList(TrainerDB,17214,L["Anchorite Fateema"],BZ["Bloodmyst Isle"],53.81,55.00,1)
-	self:addLookupList(TrainerDB,17215,L["Daedal"],BZ["Bloodmyst Isle"],53.82,55.14,1)
+	self:addLookupList(TrainerDB,16253,L["Master Chef Mouldier"],BZ["Ghostlands"],48.3,30.9,2)
+	self:addLookupList(TrainerDB,16272,L["Kanaria"],BZ["Eversong Woods"],48.5,47.6,2)
+	self:addLookupList(TrainerDB,16277,L["Quarelestra"],BZ["Eversong Woods"],48.6,47.1,2)
+	self:addLookupList(TrainerDB,16278,L["Sathein"],BZ["Eversong Woods"],53.5,51.0,2)
+	self:addLookupList(TrainerDB,16366,L["Sempstress Ambershine"],BZ["Eversong Woods"],37.4,71.9,2)
+	self:addLookupList(TrainerDB,16583,L["Rohok"],BZ["Hellfire Peninsula"],53.2,38.2,2)
+	self:addLookupList(TrainerDB,16588,L["Apothecary Antonivich"],BZ["Hellfire Peninsula"],52.4,36.5,2)
+	self:addLookupList(TrainerDB,16633,L["Sedana"],BZ["Silvermoon City"],70.0,24.0,2)
+	self:addLookupList(TrainerDB,16634,L["Dolothos"],BZ["Silvermoon City"],68.63,25.56,2) ----- hmmmm
+	self:addLookupList(TrainerDB,16639,L["Galana"],BZ["Silvermoon City"],57.26,50.32,2)  --- hmmmm
+	self:addLookupList(TrainerDB,16640,L["Keelen Sheets"],BZ["Silvermoon City"],57.0,50.1,2)
+	self:addLookupList(TrainerDB,16642,L["Camberon"],BZ["Silvermoon City"],66.1,17.4,2)
+	self:addLookupList(TrainerDB,16643,L["Razia"],BZ["Silvermoon City"],67.00,18.33,2) --- hmmmm
+	self:addLookupList(TrainerDB,16662,L["Alestus"],BZ["Silvermoon City"],77.6,71.3,2)
+	self:addLookupList(TrainerDB,16663,L["Belil"],BZ["Silvermoon City"],79.1,42.9,2)
+	self:addLookupList(TrainerDB,16667,L["Danwe"],BZ["Silvermoon City"],76.5,40.9,2)
+	self:addLookupList(TrainerDB,16668,L["Gloresse"],BZ["Silvermoon City"],75.97,39.63,2)  --- hmmm
+	self:addLookupList(TrainerDB,16669,L["Bemarrin"],BZ["Silvermoon City"],79.5,39.0,2)
+	self:addLookupList(TrainerDB,16671,L["Mirvedon"],BZ["Silvermoon City"],79.95,35.89,2)  --- hmmm
+	self:addLookupList(TrainerDB,16676,L["Sylann"],BZ["Silvermoon City"],69.5,71.5,2)
+	self:addLookupList(TrainerDB,16687,L["Talmar"],BZ["Silvermoon City"],83.16,81.18,2)  --- hmmm
+	self:addLookupList(TrainerDB,16688,L["Lynalis"],BZ["Silvermoon City"],84.0,80.2,2)
+	self:addLookupList(TrainerDB,16703,L["Amin"],BZ["Silvermoon City"],90.36,75.05,2)  --- hmmm
+	self:addLookupList(TrainerDB,16719,L["Mumman"],BZ["The Exodar"],55.6,27.1,1)
+	self:addLookupList(TrainerDB,16723,L["Lucc"],BZ["The Exodar"],27.5,60.9,1)
+	self:addLookupList(TrainerDB,16724,L["Miall"],BZ["The Exodar"],60.0,89.6,1)
+	self:addLookupList(TrainerDB,16725,L["Nahogg"],BZ["The Exodar"],40.5,39.2,1)
+	self:addLookupList(TrainerDB,16726,L["Ockil"],BZ["The Exodar"],54.0,92.1,1)
+	self:addLookupList(TrainerDB,16727,L["Padaar"],BZ["The Exodar"],44.68,25.50,1) --- hmmm
+	self:addLookupList(TrainerDB,16728,L["Akham"],BZ["The Exodar"],66.0,74.6,1)
+	self:addLookupList(TrainerDB,16729,L["Refik"],BZ["The Exodar"],63.0,67.9,1)
+	self:addLookupList(TrainerDB,16731,L["Nus"],BZ["The Exodar"],39.0,22.5,1)
+	self:addLookupList(TrainerDB,16740,L["Edrem"],BZ["The Exodar"],60.76,87.74,1) -- hmmm
+	self:addLookupList(TrainerDB,16741,L["Deriz"],BZ["The Exodar"],28.91,61.55,1) ---- hmmm
+	self:addLookupList(TrainerDB,16742,L["Kudrii"],BZ["The Exodar"],39.74,39.20,1) --- hmmm
+	self:addLookupList(TrainerDB,16743,L["Ghermas"],BZ["The Exodar"],56.00,90.54,1)  --- hmmm
+	self:addLookupList(TrainerDB,16745,L["Feruul"],BZ["The Exodar"],66.36,74.54,1) --- hmmm
+	self:addLookupList(TrainerDB,16746,L["Kayaart"],BZ["The Exodar"],63.14,68.63,1) ---hmmm
+	self:addLookupList(TrainerDB,16752,L["Muaat"],BZ["The Exodar"],60.0,87.9,1)
+	self:addLookupList(TrainerDB,16823,L["Humphry"],BZ["Hellfire Peninsula"],56.8,63.8,1)
+	self:addLookupList(TrainerDB,17214,L["Anchorite Fateema"],BZ["Azuremyst Isle"],48.5,51.8,1) --- confirm
+	self:addLookupList(TrainerDB,17215,L["Daedal"],BZ["Azuremyst Isle"],48.5,51.5,1) --- confirm
 	self:addLookupList(TrainerDB,17222,L["Artificer Daelo"],BZ["Azuremyst Isle"],48.0,51.0,1)
 	self:addLookupList(TrainerDB,17245,L["Blacksmith Calypso"],BZ["Azuremyst Isle"],46.4,71.1,1)
-	self:addLookupList(TrainerDB,17246,L["\"Cookie\" McWeaksauce"],BZ["Bloodmyst Isle"],54.12,55.28,1)
-	self:addLookupList(TrainerDB,17424,L["Anchorite Paetheus"],BZ["Bloodmyst Isle"],55.11,54.77,1)
-	self:addLookupList(TrainerDB,17442,L["Moordo"],BZ["Azuremyst Isle"],45.15,23.70,1)
-	self:addLookupList(TrainerDB,17487,L["Erin Kelly"],BZ["Azuremyst Isle"],46.87,70.13,1)
-	self:addLookupList(TrainerDB,17488,L["Dulvi"],BZ["Azuremyst Isle"],49.13,51.26,1)
-	self:addLookupList(TrainerDB,17634,L["K. Lee Smallfry"],BZ["Zangarmarsh"],68.54,48.94,1)
-	self:addLookupList(TrainerDB,17637,L["Mack Diver"],BZ["Zangarmarsh"],34.38,51.47,2)
-	self:addLookupList(TrainerDB,18747,L["Krugosh"],BZ["Hellfire Peninsula"],55.29,38.02,2)
-	self:addLookupList(TrainerDB,18749,L["Dalinna"],BZ["Undercity"],47.57,38.68,2)
-	self:addLookupList(TrainerDB,18751,L["Kalaen"],BZ["Hellfire Peninsula"],39.63,32.24,2)
-	self:addLookupList(TrainerDB,18752,L["Zebig"],BZ["Hellfire Peninsula"],55.17,38.08,2)
+	self:addLookupList(TrainerDB,17246,L["\"Cookie\" McWeaksauce"],BZ["Azuremyst Isle"],46.7,70.5,1) -- confirm
+	self:addLookupList(TrainerDB,17424,L["Anchorite Paetheus"],BZ["Bloodmyst Isle"],54.7,54.0,1)
+	self:addLookupList(TrainerDB,17442,L["Moordo"],BZ["Azuremyst Isle"],44.8,23.8,1)
+	self:addLookupList(TrainerDB,17487,L["Erin Kelly"],BZ["Azuremyst Isle"],46.2,70.5,1)
+	self:addLookupList(TrainerDB,17488,L["Dulvi"],BZ["Azuremyst Isle"],48.9,51.1,1)
+	self:addLookupList(TrainerDB,17634,L["K. Lee Smallfry"],BZ["Zangarmarsh"],68.6,50.2,1)
+	self:addLookupList(TrainerDB,17637,L["Mack Diver"],BZ["Zangarmarsh"],33.9,51.0,2)
+	self:addLookupList(TrainerDB,18747,L["Krugosh"],BZ["Hellfire Peninsula"],55.5,37.6,2)
+	self:addLookupList(TrainerDB,18749,L["Dalinna"],BZ["Hellfire Peninsula"],56.6,37.1,2) --- confirm
+	self:addLookupList(TrainerDB,18751,L["Kalaen"],BZ["Hellfire Peninsula"],56.8,37.7,2)
+	self:addLookupList(TrainerDB,18752,L["Zebig"],BZ["Hellfire Peninsula"],54.8,38.5,2)
 	self:addLookupList(TrainerDB,18753,L["Felannia"],BZ["Hellfire Peninsula"],52.3,36.1,2)
-	self:addLookupList(TrainerDB,18754,L["Barim Spilthoof"],BZ["Hellfire Peninsula"],56.35,38.40,2)
-	self:addLookupList(TrainerDB,18771,L["Brumman"],BZ["Hellfire Peninsula"],54.60,64.93,1)
+	self:addLookupList(TrainerDB,18754,L["Barim Spilthoof"],BZ["Hellfire Peninsula"],56.2,38.6,2)
+	self:addLookupList(TrainerDB,18771,L["Brumman"],BZ["Hellfire Peninsula"],54.1,64.0,1)
 	self:addLookupList(TrainerDB,18772,L["Hama"],BZ["Hellfire Peninsula"],54.1,63.6,1)
 	self:addLookupList(TrainerDB,18773,L["Johan Barnes"],BZ["Hellfire Peninsula"],53.7,66.1,1)
 	self:addLookupList(TrainerDB,18774,L["Tatiana"],BZ["Hellfire Peninsula"],54.6,63.6,1)
-	self:addLookupList(TrainerDB,18775,L["Lebowski"],BZ["Hellfire Peninsula"],56.06,64.90,1)
-	self:addLookupList(TrainerDB,18779,L["Hurnak Grimmord"],BZ["Hellfire Peninsula"],57.17,63.73,1)
-	self:addLookupList(TrainerDB,18802,L["Alchemist Gribble"],BZ["Hellfire Peninsula"],54.00,66.04,1)
-	self:addLookupList(TrainerDB,18804,L["Prospector Nachlan"],BZ["Bloodmyst Isle"],55.98,55.07,1)
-	self:addLookupList(TrainerDB,18987,L["Gaston"],BZ["Hellfire Peninsula"],54.10,63.50,1)
-	self:addLookupList(TrainerDB,18988,L["Baxter"],BZ["Hellfire Peninsula"],56.80,37.50,2)
+	self:addLookupList(TrainerDB,18775,L["Lebowski"],BZ["Hellfire Peninsula"],55.7,65.5,1)
+	self:addLookupList(TrainerDB,18779,L["Hurnak Grimmord"],BZ["Hellfire Peninsula"],56.7,63.8,1)
+	self:addLookupList(TrainerDB,18802,L["Alchemist Gribble"],BZ["Hellfire Peninsula"],53.8,65.8,1)
+	self:addLookupList(TrainerDB,18804,L["Prospector Nachlan"],BZ["Bloodmyst Isle"],56.3,54.3,1)
+	self:addLookupList(TrainerDB,18987,L["Gaston"],BZ["Hellfire Peninsula"],54.1,63.5,1)
+	self:addLookupList(TrainerDB,18988,L["Baxter"],BZ["Hellfire Peninsula"],56.8,37.5,2)
 	self:addLookupList(TrainerDB,18990,L["Burko"],BZ["Hellfire Peninsula"],22.4,39.3,1)
-	self:addLookupList(TrainerDB,18991,L["Aresella"],BZ["Hellfire Peninsula"],26.28,62.30,2)
-	self:addLookupList(TrainerDB,18993,L["Naka"],BZ["Zangarmarsh"],78.50,63.00,0)
-	self:addLookupList(TrainerDB,19052,L["Lorokeem"],BZ["Shattrath City"],46.12,21.65,0)
-	self:addLookupList(TrainerDB,19063,L["Hamanar"],BZ["Shattrath City"],35.81,20.90,0)
-	self:addLookupList(TrainerDB,19184,L["Mildred Fletcher"],BZ["Shattrath City"],65.87,15.15,0)
-	self:addLookupList(TrainerDB,19185,L["Jack Trapper"],BZ["Shattrath City"],63.50,69.32,0)
-	self:addLookupList(TrainerDB,19186,L["Kylene"],BZ["Shattrath City"],75.86,32.78,0)
-	self:addLookupList(TrainerDB,19187,L["Darmari"],BZ["Shattrath City"],67.35,66.94,0)
-	self:addLookupList(TrainerDB,19248,L["Enchanter Salias"],BZ["Shattrath City"],44.27,90.74,0)
-	self:addLookupList(TrainerDB,19249,L["Enchantress Metura"],BZ["Shattrath City"],43.90,90.40,0)
-	self:addLookupList(TrainerDB,19250,L["Enchanter Aeldron"],BZ["Shattrath City"],43.98,90.34,0)
-	self:addLookupList(TrainerDB,19251,L["Enchantress Volali"],BZ["Shattrath City"],43.45,91.95,0)
-	self:addLookupList(TrainerDB,19252,L["High Enchanter Bardolan"],BZ["Shattrath City"],43.65,92.00,0)
-	self:addLookupList(TrainerDB,19341,L["Grutah"],BZ["Shadowmoon Valley"],30.30,31.00,2)
-	self:addLookupList(TrainerDB,19369,L["Celie Steelwing"],BZ["Shadowmoon Valley"],37.20,57.98,1)
-	self:addLookupList(TrainerDB,19478,L["Fera Palerunner"],BZ["Blade's Edge Mountains"],53.90,55.18,2)
-	self:addLookupList(TrainerDB,19539,L["Jazdalaad"],BZ["Netherstorm"],44.08,34.78,0)
+	self:addLookupList(TrainerDB,18991,L["Aresella"],BZ["Hellfire Peninsula"],26.3,62.0,2)
+	self:addLookupList(TrainerDB,18993,L["Naka"],BZ["Zangarmarsh"],78.5,63.0,0)
+	self:addLookupList(TrainerDB,19052,L["Lorokeem"],BZ["Shattrath City"],45.4,19.5,0)
+	self:addLookupList(TrainerDB,19063,L["Hamanar"],BZ["Shattrath City"],35.7,20.5,0)
+	self:addLookupList(TrainerDB,19184,L["Mildred Fletcher"],BZ["Shattrath City"],66.5,13.5,0)
+	self:addLookupList(TrainerDB,19185,L["Jack Trapper"],BZ["Shattrath City"],63.0,68.5,0)
+	self:addLookupList(TrainerDB,19186,L["Kylene"],BZ["Shattrath City"],76.5,33.0,0)
+	self:addLookupList(TrainerDB,19187,L["Darmari"],BZ["Shattrath City"],66.8,67.1,0)
+	self:addLookupList(TrainerDB,19248,L["Enchanter Salias"],BZ["Shattrath City"],44.27,90.74,0) --- hmmm
+	self:addLookupList(TrainerDB,19249,L["Enchantress Metura"],BZ["Shattrath City"],43.90,90.40,0) --- hmmm
+	self:addLookupList(TrainerDB,19250,L["Enchanter Aeldron"],BZ["Shattrath City"],43.98,90.34,0) --- hmmm
+	self:addLookupList(TrainerDB,19251,L["Enchantress Volali"],BZ["Shattrath City"],43.2,92.3,0)
+	self:addLookupList(TrainerDB,19252,L["High Enchanter Bardolan"],BZ["Shattrath City"],43.2,92.2,0)
+	self:addLookupList(TrainerDB,19341,L["Grutah"],BZ["Shadowmoon Valley"],29.7,31.5,2)
+	self:addLookupList(TrainerDB,19369,L["Celie Steelwing"],BZ["Shadowmoon Valley"],37.2,58.5,1)
+	self:addLookupList(TrainerDB,19478,L["Fera Palerunner"],BZ["Blade's Edge Mountains"],53.7,55.0,2)
+	self:addLookupList(TrainerDB,19539,L["Jazdalaad"],BZ["Netherstorm"],44.5,34.0,0)
 	self:addLookupList(TrainerDB,19540,L["Asarnan"],BZ["Netherstorm"],44.2,33.7,0)
-	self:addLookupList(TrainerDB,19576,L["Xyrol"],BZ["Netherstorm"],33.12,66.78,0)
-	self:addLookupList(TrainerDB,19775,L["Kalinda"],BZ["Silvermoon City"],90.51,67.95,2)
-	self:addLookupList(TrainerDB,19778,L["Farii"],BZ["The Exodar"],44.74,25.54,1)
-	self:addLookupList(TrainerDB,20124,L["Kradu Grimblade"],BZ["Shattrath City"],70.24,43.25,0)
-	self:addLookupList(TrainerDB,20125,L["Zula Slagfury"],BZ["Shattrath City"],70.29,43.82,0)
-	self:addLookupList(TrainerDB,21087,L["Grikka"],BZ["Blade's Edge Mountains"],77.03,65.63,2)
-	self:addLookupList(TrainerDB,22477,L["Anchorite Ensham"],BZ["Terokkar Forest"],31.06,75.96,0)
-	self:addLookupList(TrainerDB,22823,L["Hch'uu"],BZ["Zangarmarsh"],19.79,52.04,0)
-	self:addLookupList(TrainerDB,22827,L["Gorgolon the All-seeing"],BZ["Blade's Edge Mountains"],0,0,0)
-	self:addLookupList(TrainerDB,22834,L["Clintar Dreamwalker"],BZ["Moonglade"],75.26,66.72,0)
+	self:addLookupList(TrainerDB,19576,L["Xyrol"],BZ["Netherstorm"],32.5,66.7,0)
+	self:addLookupList(TrainerDB,19775,L["Kalinda"],BZ["Silvermoon City"],90.5,74.1,2)
+	self:addLookupList(TrainerDB,19778,L["Farii"],BZ["The Exodar"],45.0,24.0,1)
+	self:addLookupList(TrainerDB,20124,L["Kradu Grimblade"],BZ["Shattrath City"],69.2,44.8,0)
+	self:addLookupList(TrainerDB,20125,L["Zula Slagfury"],BZ["Shattrath City"],70.1,42.0,0)
+	self:addLookupList(TrainerDB,21087,L["Grikka"],BZ["Blade's Edge Mountains"],76.8,65.5,2)
+	self:addLookupList(TrainerDB,22477,L["Anchorite Ensham"],BZ["Terokkar Forest"],30.8,75.9,0)
 	self:addLookupList(TrainerDB,23734,L["Anchorite Yazmina"],BZ["Howling Fjord"],59.5,62.3,1)
-	self:addLookupList(TrainerDB,24315,L["Ancient Female Vrykul"],BZ["Howling Fjord"],60.42,49.80,0)
-	self:addLookupList(TrainerDB,24868,L["Niobe Whizzlespark"],BZ["Shadowmoon Valley"],37.38,54.95,1)
-	self:addLookupList(TrainerDB,25099,L["Jonathan Garrett"],BZ["Shadowmoon Valley"],30.13,28.86,2)
-	self:addLookupList(TrainerDB,25277,L["Chief Engineer Leveny"],BZ["Borean Tundra"],42.47,54.05,2)
+	self:addLookupList(TrainerDB,24868,L["Niobe Whizzlespark"],BZ["Shadowmoon Valley"],36.7,54.8,1)
+	self:addLookupList(TrainerDB,25099,L["Jonathan Garrett"],BZ["Shadowmoon Valley"],29.2,28.5,2)
+	self:addLookupList(TrainerDB,25277,L["Chief Engineer Leveny"],BZ["Borean Tundra"],42.6,53.7,2)
 	self:addLookupList(TrainerDB,26564,L["Borus Ironbender"],BZ["Dragonblight"],36.6,47.1,2)
-	self:addLookupList(TrainerDB,26903,L["Lanolis Dewdrop"],BZ["Howling Fjord"],58.47,62.79,1)
+	self:addLookupList(TrainerDB,26903,L["Lanolis Dewdrop"],BZ["Howling Fjord"],58.4,62.3,1)
 	self:addLookupList(TrainerDB,26904,L["Rosina Rivet"],BZ["Howling Fjord"],59.6,63.7,1)
-	self:addLookupList(TrainerDB,26905,L["Brom Brewbaster"],BZ["Howling Fjord"],57.85,62.89,1)
-	self:addLookupList(TrainerDB,26906,L["Elizabeth Jackson"],BZ["Howling Fjord"],59.24,62.30,1)
+	self:addLookupList(TrainerDB,26905,L["Brom Brewbaster"],BZ["Howling Fjord"],58.2,62.1,1)
+	self:addLookupList(TrainerDB,26906,L["Elizabeth Jackson"],BZ["Howling Fjord"],58.6,62.8,1)
 	self:addLookupList(TrainerDB,26907,L["Tisha Longbridge"],BZ["Howling Fjord"],59.7,64.0,1)
-	self:addLookupList(TrainerDB,26911,L["Bernadette Dexter"],BZ["Howling Fjord"],60.10,63.02,1)
+	self:addLookupList(TrainerDB,26911,L["Bernadette Dexter"],BZ["Howling Fjord"],59.9,63.6,1)
 	self:addLookupList(TrainerDB,26912,L["Grumbol Stoutpick"],BZ["Howling Fjord"],59.9,63.9,1)
-	self:addLookupList(TrainerDB,26914,L["Benjamin Clegg"],BZ["Howling Fjord"],58.83,63.11,1)
+	self:addLookupList(TrainerDB,26914,L["Benjamin Clegg"],BZ["Howling Fjord"],58.6,62.8,1)
 	self:addLookupList(TrainerDB,26915,L["Ounhulo"],BZ["Howling Fjord"],59.9,63.8,1)
 	self:addLookupList(TrainerDB,26916,L["Mindri Dinkles"],BZ["Howling Fjord"],58.6,62.8,1)
-	self:addLookupList(TrainerDB,26951,L["Wilhelmina Renel"],BZ["Howling Fjord"],79.18,26.54,2)
+	self:addLookupList(TrainerDB,26951,L["Wilhelmina Renel"],BZ["Howling Fjord"],78.7,28.5,2)
 	self:addLookupList(TrainerDB,26952,L["Kristen Smythe"],BZ["Howling Fjord"],79.2,29.0,2)
-	self:addLookupList(TrainerDB,26953,L["Thomas Kolichio"],BZ["Howling Fjord"],78.96,32.32,2)
-	self:addLookupList(TrainerDB,26954,L["Emil Autumn"],BZ["Howling Fjord"],78.73,31.04,2)
+	self:addLookupList(TrainerDB,26953,L["Thomas Kolichio"],BZ["Howling Fjord"],78.6,29.4,2)
+	self:addLookupList(TrainerDB,26954,L["Emil Autumn"],BZ["Howling Fjord"],78.7,28.3,2)
 	self:addLookupList(TrainerDB,26955,L["Jamesina Watterly"],BZ["Howling Fjord"],78.5,30.0,2)
 	self:addLookupList(TrainerDB,26956,L["Sally Tompkins"],BZ["Howling Fjord"],79.4,29.4,2)
-	self:addLookupList(TrainerDB,26959,L["Booker Kells"],BZ["Howling Fjord"],79.39,27.24,2)
+	self:addLookupList(TrainerDB,26959,L["Booker Kells"],BZ["Howling Fjord"],79.4,29.3,2)
 	self:addLookupList(TrainerDB,26960,L["Carter Tiffens"],BZ["Howling Fjord"],79.3,28.8,2)
-	self:addLookupList(TrainerDB,26961,L["Gunter Hansen"],BZ["Howling Fjord"],77.98,27.01,2)
-	self:addLookupList(TrainerDB,26962,L["Jonathan Lewis"],BZ["Howling Fjord"],78.96,30.21,2)
-	self:addLookupList(TrainerDB,26964,L["Alexandra McQueen"],BZ["Howling Fjord"],79.53,30.77,2)
-	self:addLookupList(TrainerDB,26969,L["Raenah"],BZ["Borean Tundra"],41.58,53.98,2)
-	self:addLookupList(TrainerDB,26972,L["Orn Tenderhoof"],BZ["Undercity"],11.49,43.86,2)
-	self:addLookupList(TrainerDB,26975,L["Arthur Henslowe"],BZ["Borean Tundra"],41.57,54.53,2)
-	self:addLookupList(TrainerDB,26976,L["Brunna Ironaxe"],BZ["Borean Tundra"],41.93,52.48,2)
-	self:addLookupList(TrainerDB,26977,L["Adelene Sunlance"],BZ["Borean Tundra"],40.90,53.93,2)
-	self:addLookupList(TrainerDB,26980,L["Eorain Dawnstrike"],BZ["Borean Tundra"],41.41,53.00,2)
+	self:addLookupList(TrainerDB,26961,L["Gunter Hansen"],BZ["Howling Fjord"],78.3,28.2,2)
+	self:addLookupList(TrainerDB,26962,L["Jonathan Lewis"],BZ["Howling Fjord"],79.3,29.0,2)
+	self:addLookupList(TrainerDB,26964,L["Alexandra McQueen"],BZ["Howling Fjord"],79.4,30.7,2)
+	self:addLookupList(TrainerDB,26969,L["Raenah"],BZ["Borean Tundra"],41.6,53.5,2)
+	self:addLookupList(TrainerDB,26972,L["Orn Tenderhoof"],BZ["Borean Tundra"],42.0,54.2,2) -- confirm
+	self:addLookupList(TrainerDB,26975,L["Arthur Henslowe"],BZ["Borean Tundra"],41.8,54.3,2)
+	self:addLookupList(TrainerDB,26976,L["Brunna Ironaxe"],BZ["Borean Tundra"],42.6,53.2,2)
+	self:addLookupList(TrainerDB,26977,L["Adelene Sunlance"],BZ["Borean Tundra"],41.2,53.9,2)
+	self:addLookupList(TrainerDB,26980,L["Eorain Dawnstrike"],BZ["Borean Tundra"],41.2,53.9,2)
 	self:addLookupList(TrainerDB,26981,L["Crog Steelspine"],BZ["Borean Tundra"],40.8,55.3,2)
-	self:addLookupList(TrainerDB,26982,L["Geba'li"],BZ["Borean Tundra"],41.52,53.44,2)
-	self:addLookupList(TrainerDB,26987,L["Falorn Nightwhisper"],BZ["Borean Tundra"],57.67,72.02,1)
-	self:addLookupList(TrainerDB,26988,L["Argo Strongstout"],BZ["Borean Tundra"],57.99,66.12,1)
-	self:addLookupList(TrainerDB,26989,L["Rollick MacKreel"],BZ["Borean Tundra"],57.99,71.32,1)
-	self:addLookupList(TrainerDB,26990,L["Alexis Marlowe"],BZ["Borean Tundra"],58.09,71.13,1)
-	self:addLookupList(TrainerDB,26991,L["Sock Brightbolt"],BZ["Borean Tundra"],57.99,71.98,1)
+	self:addLookupList(TrainerDB,26982,L["Geba'li"],BZ["Borean Tundra"],41.6,53.4,2)
+	self:addLookupList(TrainerDB,26987,L["Falorn Nightwhisper"],BZ["Borean Tundra"],57.8,71.9,1)
+	self:addLookupList(TrainerDB,26988,L["Argo Strongstout"],BZ["Borean Tundra"],57.2,66.6,1)
+	self:addLookupList(TrainerDB,26989,L["Rollick MacKreel"],BZ["Borean Tundra"],57.9,71.5,1)
+	self:addLookupList(TrainerDB,26990,L["Alexis Marlowe"],BZ["Borean Tundra"],57.6,71.6,1)
+	self:addLookupList(TrainerDB,26991,L["Sock Brightbolt"],BZ["Borean Tundra"],57.7,72.2,1)
 	self:addLookupList(TrainerDB,26992,L["Brynna Wilson"],BZ["Borean Tundra"],57.8,66.5,1)
-	self:addLookupList(TrainerDB,26995,L["Tink Brightbolt"],BZ["Borean Tundra"],58.12,71.24,1)
-	self:addLookupList(TrainerDB,26996,L["Awan Iceborn"],BZ["Silvermoon City"],18.94,40.14,2)
-	self:addLookupList(TrainerDB,26997,L["Alestos"],BZ["Borean Tundra"],58.04,71.25,1)
-	self:addLookupList(TrainerDB,26998,L["Rosemary Bovard"],BZ["Borean Tundra"],57.93,71.33,1)
-	self:addLookupList(TrainerDB,26999,L["Fendrig Redbeard"],BZ["Borean Tundra"],58.03,66.34,1)
-	self:addLookupList(TrainerDB,27001,L["Darin Goodstitch"],BZ["Borean Tundra"],57.61,71.94,1)
+	self:addLookupList(TrainerDB,26995,L["Tink Brightbolt"],BZ["Borean Tundra"],57.6,71.7,1)
+	self:addLookupList(TrainerDB,26996,L["Awan Iceborn"],BZ["Borean Tundra"],76.3,37.0,2) --- confirm
+	self:addLookupList(TrainerDB,26997,L["Alestos"],BZ["Borean Tundra"],57.5,72.3,1)
+	self:addLookupList(TrainerDB,26998,L["Rosemary Bovard"],BZ["Borean Tundra"],57.6,71.9,1)
+	self:addLookupList(TrainerDB,26999,L["Fendrig Redbeard"],BZ["Borean Tundra"],57.5,66.2,1)
+	self:addLookupList(TrainerDB,27001,L["Darin Goodstitch"],BZ["Borean Tundra"],57.5,72.3,1)
 	self:addLookupList(TrainerDB,27023,L["Apothecary Bressa"],BZ["Dragonblight"],36.2,48.7,2)
 	self:addLookupList(TrainerDB,27029,L["Apothecary Wormwick"],BZ["Dragonblight"],76.9,62.2,2)
-	self:addLookupList(TrainerDB,27034,L["Josric Fame"],BZ["Tirisfal Glades"],65.04,16.69,2)
+	self:addLookupList(TrainerDB,27034,L["Josric Fame"],BZ["Dragonblight"],75.9,63.2,2) -- confirm
 	self:addLookupList(TrainerDB,28693,L["Enchanter Nalthanis"],BZ["Dalaran"],39.1,40.5,0)
-	self:addLookupList(TrainerDB,28694,L["Alard Schmied"],BZ["Dalaran"],45.12,27.92,0)
-	self:addLookupList(TrainerDB,28697,L["Justin Oshenko"],BZ["Dalaran"],39.20,26.16,0)
-	self:addLookupList(TrainerDB,28698,L["Jedidiah Handers"],BZ["Dalaran"],40.90,26.88,0)
-	self:addLookupList(TrainerDB,28699,L["Charles Worth"],BZ["Dalaran"],37.02,33.93,0)
-	self:addLookupList(TrainerDB,28700,L["Diane Cannings"],BZ["Dalaran"],35.62,28.98,0)
+	self:addLookupList(TrainerDB,28694,L["Alard Schmied"],BZ["Dalaran"],45.5,28.5,0)
+	self:addLookupList(TrainerDB,28697,L["Timofey Oshenko"],BZ["Dalaran"],39.0,27.5,0)
+	self:addLookupList(TrainerDB,28698,L["Jedidiah Handers"],BZ["Dalaran"],41.5,26.0,0)
+	self:addLookupList(TrainerDB,28699,L["Charles Worth"],BZ["Dalaran"],36.5,33.5,0)
+	self:addLookupList(TrainerDB,28700,L["Diane Cannings"],BZ["Dalaran"],35.7,28.8,0)
 	self:addLookupList(TrainerDB,28701,L["Timothy Jones"],BZ["Dalaran"],40.5,35.2,0)
-	self:addLookupList(TrainerDB,28702,L["Professor Pallin"],BZ["Dalaran"],42.21,37.09,0)
-	self:addLookupList(TrainerDB,28703,L["Linzy Blackbolt"],BZ["Dalaran"],41.74,31.90,0)
-	self:addLookupList(TrainerDB,28705,L["Katherine Lee"],BZ["Dalaran"],40.65,65.43,1)
-	self:addLookupList(TrainerDB,28706,L["Olisarra the Kind"],BZ["Dalaran"],37.31,36.73,0)
-	self:addLookupList(TrainerDB,29194,L["Amal'thazad"],BZ["Eastern Plaguelands"],80.59,46.22,0)
-	self:addLookupList(TrainerDB,29195,L["Lady Alistra"],BZ["Eastern Plaguelands"],83.69,43.89,0)
-	self:addLookupList(TrainerDB,29196,L["Lord Thorval"],BZ["Eastern Plaguelands"],80.99,48.09,0)
-	self:addLookupList(TrainerDB,29233,L["Nurse Applewood"],BZ["Borean Tundra"],42.08,54.59,2)
+	self:addLookupList(TrainerDB,28702,L["Professor Pallin"],BZ["Dalaran"],41.8,36.9,0)
+	self:addLookupList(TrainerDB,28703,L["Linzy Blackbolt"],BZ["Dalaran"],42.5,32.1,0)
+	self:addLookupList(TrainerDB,28705,L["Katherine Lee"],BZ["Dalaran"],40.8,65.2,1)
+	self:addLookupList(TrainerDB,28706,L["Olisarra the Kind"],BZ["Dalaran"],37.5,36.7,0)
+	self:addLookupList(TrainerDB,29194,L["Amal'thazad"],BZ["Eastern Plaguelands"],80.5,48.1,0)
+	self:addLookupList(TrainerDB,29195,L["Lady Alistra"],BZ["Eastern Plaguelands"],83.7,44.6,0)
+	self:addLookupList(TrainerDB,29196,L["Lord Thorval"],BZ["Eastern Plaguelands"],80.9,43.8,0)
+	self:addLookupList(TrainerDB,29233,L["Nurse Applewood"],BZ["Borean Tundra"],41.7,54.5,2)
 	self:addLookupList(TrainerDB,29505,L["Imindril Spearsong"],BZ["Dalaran"],45.5,28.6,0)
-	self:addLookupList(TrainerDB,29506,L["Orland Schaeffer"],BZ["Dalaran"],45.0,28.40,0)
-	self:addLookupList(TrainerDB,29507,L["Manfred Staller"],BZ["Dalaran"],34.20,29.50,0)
-	self:addLookupList(TrainerDB,29508,L["Andellion"],BZ["Dalaran"],34.40,27.30,0)
-	self:addLookupList(TrainerDB,29509,L["Namha Moonwater"],BZ["Dalaran"],36.25,29.65,0)
-	self:addLookupList(TrainerDB,29513,L["Didi the Wrench"],BZ["Dalaran"],39.70,25.10,0)
-	self:addLookupList(TrainerDB,29514,L["Findle Whistlesteam"],BZ["Dalaran"],39.50,25.20,0)
-	self:addLookupList(TrainerDB,29631,L["Awilo Lon'gomba"],BZ["Darkshore"],30.11,45.46,2)
+	self:addLookupList(TrainerDB,29506,L["Orland Schaeffer"],BZ["Dalaran"],45.0,28.4,0)
+	self:addLookupList(TrainerDB,29507,L["Manfred Staller"],BZ["Dalaran"],34.2,29.5,0)
+	self:addLookupList(TrainerDB,29508,L["Andellion"],BZ["Dalaran"],34.5,27.1,0)
+	self:addLookupList(TrainerDB,29509,L["Namha Moonwater"],BZ["Dalaran"],36.3,29.4,0)
+	self:addLookupList(TrainerDB,29513,L["Didi the Wrench"],BZ["Dalaran"],39.5,25.5,0)
+	self:addLookupList(TrainerDB,29514,L["Findle Whistlesteam"],BZ["Dalaran"],39.5,25.2,0)
+	self:addLookupList(TrainerDB,29631,L["Awilo Lon'gomba"],BZ["Dalaran"],70.0,38.6,2)
 	self:addLookupList(TrainerDB,29924,L["Brandig"],BZ["The Storm Peaks"],28.9,74.9,1)
-	self:addLookupList(TrainerDB,30706,L["Jo'mah"],BZ["Orgrimmar"],55.94,45.77,2)
-	self:addLookupList(TrainerDB,30709,L["Poshken Hardbinder"],BZ["Thunder Bluff"],28.64,20.95,2)
-	self:addLookupList(TrainerDB,30710,L["Zantasia"],BZ["Silvermoon City"],69.11,24.94,2)
+	self:addLookupList(TrainerDB,30706,L["Jo'mah"],BZ["Orgrimmar"],56.2,46.5,2)
+	self:addLookupList(TrainerDB,30709,L["Poshken Hardbinder"],BZ["Thunder Bluff"],29.2,22.0,2)
+	self:addLookupList(TrainerDB,30710,L["Zantasia"],BZ["Silvermoon City"],69.5,24.0,2)
 	self:addLookupList(TrainerDB,30711,L["Margaux Parchley"],BZ["Undercity"],61.0,58.5,2)
-	self:addLookupList(TrainerDB,30713,L["Catarina Stanford"],BZ["Stormwind City"],49.71,75.05,1)
-	self:addLookupList(TrainerDB,30715,L["Feyden Darkin"],BZ["Darnassus"],59.07,14.36,1)
-	self:addLookupList(TrainerDB,30716,L["Thoth"],BZ["The Exodar"],39.77,38.91,1)
-	self:addLookupList(TrainerDB,30717,L["Elise Brightletter"],BZ["Ironforge"],61.05,44.11,1)
+	self:addLookupList(TrainerDB,30713,L["Catarina Stanford"],BZ["Stormwind City"],49.8,74.7,1)
+	self:addLookupList(TrainerDB,30715,L["Feyden Darkin"],BZ["Darnassus"],58.9,14.1,1)
+	self:addLookupList(TrainerDB,30716,L["Thoth"],BZ["The Exodar"],40.5,39.1,1)
+	self:addLookupList(TrainerDB,30717,L["Elise Brightletter"],BZ["Ironforge"],60.7,44.9,1)
 	self:addLookupList(TrainerDB,30721,L["Michael Schwan"],BZ["Hellfire Peninsula"],53.9,65.5,1)
-	self:addLookupList(TrainerDB,30722,L["Neferatti"],BZ["Hellfire Peninsula"],52.56,37.11,2)
-	self:addLookupList(TrainerDB,31084,L["Highlord Darion Mograine"],BZ["Eastern Plaguelands"],83.17,44.80,0)
+	self:addLookupList(TrainerDB,30722,L["Neferatti"],BZ["Hellfire Peninsula"],52.3,36.1,2)
+	self:addLookupList(TrainerDB,31084,L["Highlord Darion Mograine"],BZ["Eastern Plaguelands"],83.5,49.5,0)
 	self:addLookupList(TrainerDB,33580,L["Dustin Vail"],BZ["Icecrown"],73.0,20.8,0)
 	self:addLookupList(TrainerDB,33581,L["Kul'de"],BZ["Icecrown"],71.8,20.8,0)
 	self:addLookupList(TrainerDB,33583,L["Fael Morningsong"],BZ["Icecrown"],73.0,20.6,0)