diff --git a/.pkgmeta b/.pkgmeta
index dfdf10dc..ed62d790 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -22,6 +22,7 @@ move-folders:
   AtlasLoot/AtlasLoot_BattleforAzeroth: AtlasLoot_BattleforAzeroth
   AtlasLoot/AtlasLoot_Shadowlands: AtlasLoot_Shadowlands
   AtlasLoot/AtlasLoot_Dragonflight: AtlasLoot_Dragonflight
+  AtlasLoot/AtlasLoot_TheWarWithin: AtlasLoot_TheWarWithin
 
 # Ignore takes place before folder's moving takes place
 ignore:
diff --git a/AtlasLoot/AtlasLoot.lua b/AtlasLoot/AtlasLoot.lua
index fa54ed7a..f19c7179 100644
--- a/AtlasLoot/AtlasLoot.lua
+++ b/AtlasLoot/AtlasLoot.lua
@@ -100,6 +100,13 @@ ATLASLOOT_INSTANCE_MODULE_LIST = {}
 
 -- A list of officiel AtlasLoot modules
 ATLASLOOT_MODULE_LIST = {
+	{
+		addonName = "AtlasLoot_TheWarWithin",
+		icon = "Interface\\ICONS\\ui_delves",
+		name = EXPANSION_NAME10,
+		tt_title = nil, -- ToolTip title
+		tt_text = nil, -- ToolTip text
+	},
 	{
 		addonName = "AtlasLoot_Dragonflight",
 		icon = "Interface\\ICONS\\ability_dragonriding_athomealoft01",
diff --git a/AtlasLoot/CHANGELOG.md b/AtlasLoot/CHANGELOG.md
index d01ce8dd..d818a727 100644
--- a/AtlasLoot/CHANGELOG.md
+++ b/AtlasLoot/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog
 
-## 8.14.0 - January 9, 2024
+## 8.15.0 - January 12, 2025
+
+### Added
+
+- Added The War Within instance loot
+
+### Fixed
+
+- Fixed error when right clicking on the spec filter button
+
+## 8.14.0 - January 9, 2025
 
 ### Added
 
diff --git a/AtlasLoot/Data/Mount.lua b/AtlasLoot/Data/Mount.lua
index 4a4e1a16..ea07ec41 100644
--- a/AtlasLoot/Data/Mount.lua
+++ b/AtlasLoot/Data/Mount.lua
@@ -24,1155 +24,1161 @@ local MOUNT_INFO = {
 	--[[
 	filter from https://www.wowhead.com/spells/mounts
 	]]
-	["spells"] = { 
+	["spells"] = {
 		-- [spellID] = itemID
-		[458] = 5656, 			-- Brown Horse
-		[459] = NO_ITEM_ID, 		-- Gray Wolf
-		[468] = NO_ITEM_ID, 		-- White Stallion
-		[470] = 2411, 			-- Black Stallion
-		[472] = 2414, 			-- Pinto
-		[578] = NO_ITEM_ID, 		-- Black Wolf
-		[579] = NO_ITEM_ID, 		-- Red Wolf
-		[580] = 1132, 			-- Timber Wolf
-		[581] = NO_ITEM_ID, 		-- Winter Wolf
-		[5784] = NO_ITEM_ID, 		-- Felsteed
-		[6648] = 5655, 			-- Chestnut Mare
-		[6653] = 5665, 			-- Dire Wolf
-		[6654] = 5668, 			-- Brown Wolf
-		[6777] = 5864, 			-- Gray Ram
-		[6896] = 13328, 		-- Black Ram
-		[6898] = 5873, 			-- White Ram
-		[6899] = 5872, 			-- Brown Ram
-		[8394] = 8631, 			-- Striped Frostsaber
-		[8395] = 8588, 			-- Emerald Raptor
-		[8980] = NO_ITEM_ID, 		-- Skeletal Horse
-		[10789] = 8632, 		-- Spotted Frostsaber
-		[10790] = NO_ITEM_ID, 		-- Tiger
-		[10793] = 8629, 		-- Striped Nightsaber
-		[10795] = NO_ITEM_ID, 		-- Ivory Raptor
-		[10796] = 8591, 		-- Turquoise Raptor
-		[10799] = 8592, 		-- Violet Raptor
-		[10873] = 8563, 		-- Red Mechanostrider
-		[10969] = 8595, 		-- Blue Mechanostrider
-		[13819] = NO_ITEM_ID, 		-- Warhorse
-		[15779] = 13326, 		-- White Mechanostrider Mod B
-		[15780] = 13321, 		-- Green Mechanostrider
-		[16055] = 12303, 		-- Black Nightsaber
-		[16056] = 12302, 		-- Ancient Frostsaber
-		[16080] = 12330, 		-- Red Wolf
-		[16081] = 12351, 		-- Arctic Wolf
-		[16082] = 12354, 		-- Palomino
-		[16083] = 12353, 		-- White Stallion
-		[16084] = 8586, 		-- Mottled Red Raptor
-		[17229] = 13086, 		-- Winterspring Frostsaber
-		[17450] = 13317, 		-- Ivory Raptor
-		[17453] = 13321, 		-- Green Mechanostrider
-		[17454] = 13322, 		-- Unpainted Mechanostrider
-		[17459] = 13327, 		-- Icy Blue Mechanostrider Mod A
-		[17460] = 13329, 		-- Frost Ram
-		[17461] = 13328, 		-- Black Ram
-		[17462] = 13331, 		-- Red Skeletal Horse
-		[17463] = 13332, 		-- Blue Skeletal Horse
-		[17464] = 13333, 		-- Brown Skeletal Horse
-		[17465] = 13334, 		-- Green Skeletal Warhorse
-		[17481] = 13335, 		-- Rivendare's Deathcharger
-		[18363] = NO_ITEM_ID, 		-- Riding Kodo
-		[18989] = 15277, 		-- Gray Kodo
-		[18990] = 15290, 		-- Brown Kodo
-		[18991] = 15292, 		-- Green Kodo
-		[18992] = 15293, 		-- Teal Kodo
-		[22717] = 29468, 		-- Black War Steed
-		[22718] = 29466, 		-- Black War Kodo
-		[22719] = 29465, 		-- Black Battlestrider
-		[22720] = 29467, 		-- Black War Ram
-		[22721] = 29472, 		-- Black War Raptor
-		[22722] = 29470, 		-- Red Skeletal Warhorse
-		[22723] = 29471, 		-- Black War Tiger
-		[22724] = 29469, 		-- Black War Wolf
-		[23161] = NO_ITEM_ID, 		-- Dreadsteed
-		[23214] = NO_ITEM_ID, 		-- Charger
-		[23219] = 18767, 		-- Swift Mistsaber
-		[23221] = 18766, 		-- Swift Frostsaber
-		[23222] = 18774, 		-- Swift Yellow Mechanostrider
-		[23223] = 18773, 		-- Swift White Mechanostrider
-		[23225] = 18772, 		-- Swift Green Mechanostrider
-		[23227] = 18776, 		-- Swift Palomino
-		[23228] = 18778, 		-- Swift White Steed
-		[23229] = 18777, 		-- Swift Brown Steed
-		[23238] = 18786, 		-- Swift Brown Ram
-		[23239] = 18787, 		-- Swift Gray Ram
-		[23240] = 18785, 		-- Swift White Ram
-		[23241] = 18788, 		-- Swift Blue Raptor
-		[23242] = 18789, 		-- Swift Olive Raptor
-		[23243] = 18790, 		-- Swift Orange Raptor
-		[23246] = 18791, 		-- Purple Skeletal Warhorse
-		[23247] = 18793, 		-- Great White Kodo
-		[23248] = 18795, 		-- Great Gray Kodo
-		[23249] = 18794, 		-- Great Brown Kodo
-		[23250] = 18796, 		-- Swift Brown Wolf
-		[23251] = 18797, 		-- Swift Timber Wolf
-		[23252] = 18798, 		-- Swift Gray Wolf
-		[23338] = 18902, 		-- Swift Stormsaber
-		[23509] = 19029, 		-- Frostwolf Howler
-		[23510] = 19030, 		-- Stormpike Battle Charger
-		[24242] = 19872, 		-- Swift Razzashi Raptor
-		[24252] = 19902, 		-- Swift Zulian Tiger
-		[25863] = NO_ITEM_ID, 		-- Black Qiraji Battle Tank
-		[25953] = 21218, 		-- Blue Qiraji Battle Tank
-		[26054] = 21321, 		-- Red Qiraji Battle Tank
-		[26055] = 21324, 		-- Yellow Qiraji Battle Tank
-		[26056] = 21323, 		-- Green Qiraji Battle Tank
-		[26655] = NO_ITEM_ID, 		-- Black Qiraji Battle Tank
-		[26656] = 21176, 		-- Black Qiraji Battle Tank
-		[28828] = NO_ITEM_ID, 		-- Nether Drake
-		[30174] = 23720, 		-- Riding Turtle
-		[32235] = 25470, 		-- Golden Gryphon
-		[32239] = 25471, 		-- Ebon Gryphon
-		[32240] = 25472, 		-- Snowy Gryphon
-		[32242] = 25473, 		-- Swift Blue Gryphon
-		[32243] = 25474, 		-- Tawny Wind Rider
-		[32244] = 25475, 		-- Blue Wind Rider
-		[32245] = 25476, 		-- Green Wind Rider
-		[32246] = 25477, 		-- Swift Red Wind Rider
-		[32289] = 25527, 		-- Swift Red Gryphon
-		[32290] = 25528, 		-- Swift Green Gryphon
-		[32292] = 25529, 		-- Swift Purple Gryphon
-		[32295] = 25531, 		-- Swift Green Wind Rider
-		[32296] = 25532, 		-- Swift Yellow Wind Rider
-		[32297] = 25533, 		-- Swift Purple Wind Rider
-		[32345] = NO_ITEM_ID, 		-- Peep the Phoenix Mount
-		[33630] = 8595, 		-- Blue Mechanostrider
-		[33660] = 28936, 		-- Swift Pink Hawkstrider
-		[34406] = 28481, 		-- Brown Elekk
-		[34767] = NO_ITEM_ID, 		-- Thalassian Charger
-		[34769] = NO_ITEM_ID, 		-- Thalassian Warhorse
-		[34790] = 29228, 		-- Dark War Talbuk
-		[34795] = 28927, 		-- Red Hawkstrider
-		[34896] = 29102, 		-- Cobalt War Talbuk
-		[34897] = 29103, 		-- White War Talbuk
-		[34898] = 29104, 		-- Silver War Talbuk
-		[34899] = 29105, 		-- Tan War Talbuk
-		[35018] = 29222, 		-- Purple Hawkstrider
-		[35020] = 29220, 		-- Blue Hawkstrider
-		[35022] = 29221, 		-- Black Hawkstrider
-		[35025] = 29223, 		-- Swift Green Hawkstrider
-		[35027] = 29224, 		-- Swift Purple Hawkstrider
-		[35028] = 34129, 		-- Swift Warstrider
-		[35710] = 29744, 		-- Gray Elekk
-		[35711] = 29743, 		-- Purple Elekk
-		[35712] = 29746, 		-- Great Green Elekk
-		[35713] = 29745, 		-- Great Blue Elekk
-		[35714] = 29747, 		-- Great Purple Elekk
-		[36702] = 30480, 		-- Fiery Warhorse
-		[37015] = 30609, 		-- Swift Nether Drake
-		[39315] = 31829, 		-- Cobalt Riding Talbuk
-		[39316] = 28915, 		-- Dark Riding Talbuk
-		[39317] = 31831, 		-- Silver Riding Talbuk
-		[39318] = 31833, 		-- Tan Riding Talbuk
-		[39319] = 31835, 		-- White Riding Talbuk
-		[39798] = 32314, 		-- Green Riding Nether Ray
-		[39800] = 32317, 		-- Red Riding Nether Ray
-		[39801] = 32316, 		-- Purple Riding Nether Ray
-		[39802] = 32318, 		-- Silver Riding Nether Ray
-		[39803] = 32319, 		-- Blue Riding Nether Ray
-		[40192] = 32458, 		-- Ashes of Al'ar
-		[41252] = 32768, 		-- Raven Lord
-		[41513] = 32857, 		-- Onyx Netherwing Drake
-		[41514] = 32858, 		-- Azure Netherwing Drake
-		[41515] = 32859, 		-- Cobalt Netherwing Drake
-		[41516] = 32860, 		-- Purple Netherwing Drake
-		[41517] = 32861, 		-- Veridian Netherwing Drake
-		[41518] = 32862, 		-- Violet Netherwing Drake
-		[42776] = 49283, 		-- Spectral Tiger
-		[42777] = 49284, 		-- Swift Spectral Tiger
-		[43688] = 33809, 		-- Amani War Bear
-		[43899] = 33976, 		-- Brewfest Ram
-		[43900] = 33977, 		-- Swift Brewfest Ram
-		[43927] = 33999, 		-- Cenarion War Hippogryph
-		[44151] = 34061, 		-- Turbo-Charged Flying Machine
-		[44153] = 34060, 		-- Flying Machine
-		[44317] = 34092, 		-- Merciless Nether Drake
-		[44744] = 34092, 		-- Merciless Nether Drake
-		[46197] = 49285, 		-- X-51 Nether-Rocket
-		[46199] = 49286, 		-- X-51 Nether-Rocket X-TREME
-		[46628] = 35513, 		-- Swift White Hawkstrider
-		[48025] = 37012, 		-- Headless Horseman's Mount
-		[48027] = 35906, 		-- Black War Elekk
-		[48778] = NO_ITEM_ID, 		-- Acherus Deathcharger
-		[48954] = 37719, 		-- Swift Zhevra
-		[49193] = 37676, 		-- Vengeful Nether Drake
-		[49322] = 37719, 		-- Swift Zhevra
-		[49378] = NO_ITEM_ID, 		-- Brewfest Riding Kodo
-		[49379] = 37828, 		-- Great Brewfest Kodo
-		[50869] = NO_ITEM_ID, 		-- Brewfest Kodo
-		[51412] = 49282, 		-- Big Battle Bear
-		[54729] = 40775, 		-- Winged Steed of the Ebon Blade
-		[54753] = 43962, 		-- White Polar Bear
-		[55164] = NO_ITEM_ID, 		-- Swift Spectral Gryphon
-		[55531] = 41508, 		-- Mechano-Hog
-		[58615] = 43516, 		-- Brutal Nether Drake
-		[58819] = NO_ITEM_ID, 		-- Swift Brown Steed
-		[58983] = 43599, 		-- Big Blizzard Bear
-		[59567] = 43952, 		-- Azure Drake
-		[59568] = 43953, 		-- Blue Drake
-		[59569] = 43951, 		-- Bronze Drake
-		[59570] = 43955, 		-- Red Drake
-		[59571] = 43954, 		-- Twilight Drake
-		[59572] = NO_ITEM_ID, 		-- Black Polar Bear
-		[59650] = 43986, 		-- Black Drake
-		[59785] = 43956, 		-- Black War Mammoth
-		[59788] = 44077, 		-- Black War Mammoth
-		[59791] = 44230, 		-- Wooly Mammoth
-		[59793] = 44231, 		-- Wooly Mammoth
-		[59797] = 44080, 		-- Ice Mammoth
-		[59799] = 43958, 		-- Ice Mammoth
-		[59961] = 44160, 		-- Red Proto-Drake
-		[59976] = 44164, 		-- Black Proto-Drake
-		[59996] = 44151, 		-- Blue Proto-Drake
-		[60002] = 44168, 		-- Time-Lost Proto-Drake
-		[60021] = 44175, 		-- Plagued Proto-Drake
-		[60024] = 44177, 		-- Violet Proto-Drake
-		[60025] = 44178, 		-- Albino Drake
-		[60114] = 44225, 		-- Armored Brown Bear
-		[60116] = 44226, 		-- Armored Brown Bear
-		[60118] = 44223, 		-- Black War Bear
-		[60119] = 44224, 		-- Black War Bear
-		[60136] = NO_ITEM_ID, 		-- Grand Caravan Mammoth
-		[60140] = NO_ITEM_ID, 		-- Grand Caravan Mammoth
-		[60424] = 44413, 		-- Mekgineer's Chopper
-		[61229] = 44689, 		-- Armored Snowy Gryphon
-		[61230] = 44690, 		-- Armored Blue Wind Rider
-		[61294] = 44707, 		-- Green Proto-Drake
-		[61309] = 44558, 		-- Magnificent Flying Carpet
-		[61425] = 44235, 		-- Traveler's Tundra Mammoth
-		[61447] = 44234, 		-- Traveler's Tundra Mammoth
-		[61451] = 44554, 		-- Flying Carpet
-		[61465] = 43959, 		-- Grand Black War Mammoth
-		[61467] = 44083, 		-- Grand Black War Mammoth
-		[61469] = 44086, 		-- Grand Ice Mammoth
-		[61470] = 43961, 		-- Grand Ice Mammoth
-		[61996] = 44843, 		-- Blue Dragonhawk
-		[61997] = 44842, 		-- Red Dragonhawk
-		[62048] = 186469, 		-- Black Dragonhawk Mount
-		[63232] = 45125, 		-- Stormwind Steed
-		[63635] = 45593, 		-- Darkspear Raptor
-		[63636] = 45586, 		-- Ironforge Ram
-		[63637] = 45591, 		-- Darnassian Nightsaber
-		[63638] = 45589, 		-- Gnomeregan Mechanostrider
-		[63639] = 45590, 		-- Exodar Elekk
-		[63640] = 45595, 		-- Orgrimmar Wolf
-		[63641] = 45592, 		-- Thunder Bluff Kodo
-		[63642] = 45596, 		-- Silvermoon Hawkstrider
-		[63643] = 45597, 		-- Forsaken Warhorse
-		[63796] = 45693, 		-- Mimiron's Head
-		[63844] = 45725, 		-- Argent Hippogryph
-		[63956] = 45801, 		-- Ironbound Proto-Drake
-		[63963] = 45802, 		-- Rusted Proto-Drake
-		[64656] = NO_ITEM_ID, 		-- Blue Skeletal Warhorse
-		[64657] = 46100, 		-- White Kodo
-		[64658] = 46099, 		-- Black Wolf
-		[64659] = 46102, 		-- Venomhide Ravasaur
-		[64731] = 46109, 		-- Sea Turtle
-		[64927] = 46708, 		-- Deadly Gladiator's Frost Wyrm
-		[64977] = 46308, 		-- Black Skeletal Horse
-		[65439] = 46171, 		-- Furious Gladiator's Frost Wyrm
-		[65637] = 46745, 		-- Great Red Elekk
-		[65638] = 46744, 		-- Swift Moonsaber
-		[65639] = 46751, 		-- Swift Red Hawkstrider
-		[65640] = 46752, 		-- Swift Gray Steed
-		[65641] = 46750, 		-- Great Golden Kodo
-		[65642] = 46747, 		-- Turbostrider
-		[65643] = 46748, 		-- Swift Violet Ram
-		[65644] = 46743, 		-- Swift Purple Raptor
-		[65645] = 46746, 		-- White Skeletal Warhorse
-		[65646] = 46749, 		-- Swift Burgundy Wolf
-		[65917] = 49290, 		-- Magic Rooster
-		[66087] = 46813, 		-- Silver Covenant Hippogryph
-		[66088] = 46814, 		-- Sunreaver Dragonhawk
-		[66090] = 46815, 		-- Quel'dorei Steed
-		[66091] = 46816, 		-- Sunreaver Hawkstrider
-		[66122] = NO_ITEM_ID, 		-- Magic Rooster
-		[66123] = NO_ITEM_ID, 		-- Magic Rooster
-		[66124] = NO_ITEM_ID, 		-- Magic Rooster
-		[66846] = 47101, 		-- Ochre Skeletal Warhorse
-		[66847] = 47100, 		-- Striped Dawnsaber
-		[66906] = 47179, 		-- Argent Charger
-		[66907] = 47180, 		-- Argent Warhorse
-		[67336] = 47840, 		-- Relentless Gladiator's Frost Wyrm
-		[67466] = 47180, 		-- Argent Warhorse
-		[68056] = 49046, 		-- Swift Horde Wolf
-		[68057] = 49044, 		-- Swift Alliance Steed
-		[68187] = 49096, 		-- Crusader's White Warhorse
-		[68188] = 49098, 		-- Crusader's Black Warhorse
-		[69395] = 49636, 		-- Onyxian Drake
-		[69820] = NO_ITEM_ID, 		-- Sunwalker Kodo
-		[69826] = NO_ITEM_ID, 		-- Great Sunwalker Kodo
-		[71342] = 50250,		-- X-45 Heartbreaker
-		[71810] = 50435, 		-- Wrathful Gladiator's Frost Wyrm
-		[72286] = 50818, 		-- Invincible
-		[72807] = 51955, 		-- Icebound Frostbrood Vanquisher
-		[72808] = 51954, 		-- Bloodbathed Frostbrood Vanquisher
-		[73313] = 52200, 		-- Crimson Deathcharger
-		[73629] = NO_ITEM_ID, 		-- Exarch's Elekk
-		[73630] = NO_ITEM_ID, 		-- Great Exarch's Elekk
-		[74856] = 54069, 		-- Blazing Hippogryph
-		[74918] = 54068, 		-- Wooly White Rhino
-		[75207] = 54465, 		-- Vashj'ir Seahorse
-		[75596] = 54797, 		-- Frosty Flying Carpet
-		[75614] = 54811, 		-- Celestial Steed
-		[75973] = 54860, 		-- X-53 Touring Rocket
-		[84751] = 60954, 		-- Fossilized Raptor
-		[87090] = 62461, 		-- Goblin Trike
-		[87091] = 62462, 		-- Goblin Turbo-Trike
-		[88331] = 62900, 		-- Volcanic Stone Drake
-		[88335] = 62901, 		-- Drake of the East Wind
-		[88718] = 63042, 		-- Phosphorescent Stone Drake
-		[88741] = 63039, 		-- Drake of the West Wind
-		[88742] = 63040, 		-- Drake of the North Wind
-		[88744] = 63041, 		-- Drake of the South Wind
-		[88746] = 63043, 		-- Vitreous Stone Drake
-		[88748] = 63044, 		-- Brown Riding Camel
-		[88749] = 63045, 		-- Tan Riding Camel
-		[88750] = 63046, 		-- Grey Riding Camel
-		[88990] = 63125, 		-- Dark Phoenix
-		[89520] = NO_ITEM_ID, 		-- Goblin Mini Hotrod
-		[90621] = 62298, 		-- Golden King
-		[92155] = 64883, 		-- Ultramarine Qiraji Battle Tank
-		[92231] = 64998, 		-- Spectral Steed
-		[92232] = 64999, 		-- Spectral Wolf
-		[93326] = 65891, 		-- Sandstone Drake
-		[93623] = 68008, 		-- Mottled Drake
-		[93644] = 67107, 		-- Kor'kron Annihilator
-		[96491] = 68823, 		-- Armored Razzashi Raptor
-		[96499] = 68824, 		-- Swift Zulian Panther
-		[96503] = 68825, 		-- Amani Dragonhawk
-		[97359] = 69213, 		-- Flameward Hippogryph
-		[97493] = 69224, 		-- Pureblood Fire Hawk
-		[97501] = 69226, 		-- Felfire Hawk
-		[97560] = 69230, 		-- Corrupted Fire Hawk
-		[97581] = 69228, 		-- Savage Raptor
-		[98204] = 69747, 		-- Amani Battle Bear
-		[98718] = 67151, 		-- Subdued Seahorse
-		[98727] = 69846, 		-- Winged Guardian
-		[100332] = 70909, 		-- Vicious War Steed
-		[100333] = 70910, 		-- Vicious War Wolf
-		[101282] = 71339, 		-- Vicious Gladiator's Twilight Drake
-		[101542] = 71665, 		-- Flametalon of Alysrazor
-		[101573] = 71718, 		-- Swift Shorestrider
-		[101821] = 71954, 		-- Ruthless Gladiator's Twilight Drake
-		[102346] = 72140, 		-- Swift Forest Strider
-		[102349] = 72145, 		-- Swift Springstrider
-		[102350] = 72146, 		-- Swift Lovebird
-		[102488] = 72575, 		-- White Riding Camel
-		[102514] = 72582, 		-- Corrupted Hippogryph
-		[103081] = 73766, 		-- Darkmoon Dancing Bear
-		[103195] = 73838, 		-- Mountain Horse
-		[103196] = 73839, 		-- Swift Mountain Horse
-		[107203] = 76755, 		-- Tyrael's Charger
-		[107516] = 76889, 		-- Spectral Gryphon
-		[107517] = 76902, 		-- Spectral Wind Rider
-		[107842] = 77067, 		-- Blazing Drake
-		[107844] = 77068, 		-- Twilight Harbinger
-		[107845] = 77069, 		-- Life-Binder's Handmaiden
-		[110039] = 78919, 		-- Experiment 12-B
-		[110051] = 78924, 		-- Heart of the Aspects
-		[113120] = 79771, 		-- Feldrake
-		[113199] = 79802, 		-- Jade Cloud Serpent
-		[118089] = 81354, 		-- Azure Water Strider
-		[118737] = 81559, 		-- Pandaren Kite
-		[120043] = 82453, 		-- Jeweled Onyx Panther
-		[120395] = 82765, 		-- Green Dragon Turtle
-		[120822] = 82811, 		-- Great Red Dragon Turtle
-		[121820] = 83086, 		-- Obsidian Nightwing
-		[121836] = 83090, 		-- Sapphire Panther
-		[121837] = 83088, 		-- Jade Panther
-		[121838] = 83087, 		-- Ruby Panther
-		[121839] = 83089, 		-- Sunstone Panther
-		[122708] = 84101, 		-- Grand Expedition Yak
-		[123160] = NO_ITEM_ID, 		-- Crimson Riding Crane
-		[123182] = NO_ITEM_ID, 		-- White Riding Yak
-		[123886] = 85262, 		-- Amber Scorpion
-		[123992] = 85430, 		-- Azure Cloud Serpent
-		[123993] = 85429, 		-- Golden Cloud Serpent
-		[124408] = 85666, 		-- Thundering Jade Cloud Serpent
-		[124550] = 85785, 		-- Cataclysmic Gladiator's Twilight Drake
-		[124659] = 85870, 		-- Imperial Quilen
-		[126507] = 87250, 		-- Depleted-Kyparium Rocket
-		[126508] = 87251, 		-- Geosynchronous World Spinner
-		[127154] = 87768, 		-- Onyx Cloud Serpent
-		[127156] = 87769, 		-- Crimson Cloud Serpent
-		[127158] = 87771, 		-- Heavenly Onyx Cloud Serpent
-		[127161] = 87773, 		-- Heavenly Crimson Cloud Serpent
-		[127164] = 87774, 		-- Heavenly Golden Cloud Serpent
-		[127165] = 87775, 		-- Yu'lei, Daughter of Jade
-		[127169] = 87776, 		-- Heavenly Azure Cloud Serpent
-		[127170] = 87777, 		-- Astral Cloud Serpent
-		[127174] = 87781, 		-- Azure Riding Crane
-		[127176] = 87782, 		-- Golden Riding Crane
-		[127177] = 87783, 		-- Regal Riding Crane
-		[127178] = NO_ITEM_ID, 		-- Jungle Riding Crane
-		[127180] = NO_ITEM_ID, 		-- Albino Riding Crane
-		[127209] = NO_ITEM_ID, 		-- Black Riding Yak
-		[127213] = NO_ITEM_ID, 		-- Brown Riding Yak
-		[127216] = 87788, 		-- Grey Riding Yak
-		[127220] = 87789, 		-- Blonde Riding Yak
-		[127271] = 87791, 		-- Crimson Water Strider
-		[127272] = NO_ITEM_ID, 		-- Orange Water Strider
-		[127274] = NO_ITEM_ID, 		-- Jade Water Strider
-		[127278] = NO_ITEM_ID, 		-- Golden Water Strider
-		[127286] = 87795, 		-- Black Dragon Turtle
-		[127287] = 87796, 		-- Blue Dragon Turtle
-		[127288] = 87797, 		-- Brown Dragon Turtle
-		[127289] = 87799, 		-- Purple Dragon Turtle
-		[127290] = 87800, 		-- Red Dragon Turtle
-		[127293] = 87801, 		-- Great Green Dragon Turtle
-		[127295] = 87802, 		-- Great Black Dragon Turtle
-		[127302] = 87803, 		-- Great Blue Dragon Turtle
-		[127308] = 87804, 		-- Great Brown Dragon Turtle
-		[127310] = 87805, 		-- Great Purple Dragon Turtle
-		[129552] = 89154, 		-- Crimson Pandaren Phoenix
-		[129918] = 89304, 		-- Thundering August Cloud Serpent
-		[129932] = 89305, 		-- Green Shado-Pan Riding Tiger
-		[129934] = 89307, 		-- Blue Shado-Pan Riding Tiger
-		[129935] = 89306, 		-- Red Shado-Pan Riding Tiger
-		[130086] = 89362, 		-- Brown Riding Goat
-		[130092] = 89363, 		-- Red Flying Cloud
-		[130137] = 89390, 		-- White Riding Goat
-		[130138] = 89391, 		-- Black Riding Goat
-		[130965] = 89783, 		-- Son of Galleon
-		[130985] = 89785, 		-- Pandaren Kite
-		[132036] = 90655, 		-- Thundering Ruby Cloud Serpent
-		[132117] = 90710, 		-- Ashen Pandaren Phoenix
-		[132118] = 90711, 		-- Emerald Pandaren Phoenix
-		[132119] = 90712, 		-- Violet Pandaren Phoenix
-		[133023] = 91802, 		-- Jade Pandaren Kite
-		[134359] = 95416, 		-- Sky Golem
-		[134573] = 92724, 		-- Swift Windsteed
-		[135416] = 93168, 		-- Grand Armored Gryphon
-		[135418] = 93169, 		-- Grand Armored Wyvern
-		[136163] = 93385, 		-- Grand Gryphon
-		[136164] = 93386, 		-- Grand Wyvern
-		[136400] = 93662, 		-- Armored Skyscreamer
-		[136471] = 93666, 		-- Spawn of Horridon
-		[136505] = 93671, 		-- Ghastly Charger
-		[138423] = 94228, 		-- Cobalt Primordial Direhorn
-		[138424] = 94230, 		-- Amber Primordial Direhorn
-		[138425] = 94229, 		-- Slate Primordial Direhorn
-		[138426] = 94231, 		-- Jade Primordial Direhorn
-		[138640] = 94290, 		-- Bone-White Primal Raptor
-		[138641] = 94291, 		-- Red Primal Raptor
-		[138642] = 94292, 		-- Black Primal Raptor
-		[138643] = 94293, 		-- Green Primal Raptor
-		[139407] = 95041, 		-- Malevolent Gladiator's Cloud Serpent
-		[139442] = 95057, 		-- Thundering Cobalt Cloud Serpent
-		[139448] = 95059, 		-- Clutch of Ji-Kun
-		[139595] = 95341, 		-- Armored Bloodwing
-		[140249] = 95564, 		-- Golden Primal Direhorn
-		[140250] = 95565, 		-- Crimson Primal Direhorn
-		[142073] = 98618, 		-- Hearthsteed
-		[142266] = 98104, 		-- Armored Red Dragonhawk
-		[142478] = 98259, 		-- Armored Blue Dragonhawk
-		[142641] = 98405, 		-- Brawler's Burly Mushan Beast
-		[142878] = 97989, 		-- Enchanted Fey Dragon
-		[142910] = 129744,		-- Ironbound Wraithcharger
-		[146615] = 102514,		-- Vicious Kaldorei Warsaber
-		[146622] = 102533, 		-- Vicious Skeletal Warhorse
-		[147595] = 104011, 		-- Stormcrow
-		[148392] = 104208, 		-- Spawn of Galakras
-		[148396] = 104246, 		-- Kor'kron War Wolf
-		[148417] = 104253, 		-- Kor'kron Juggernaut
-		[148428] = 103638, 		-- Ashhide Mushan Beast
-		[148476] = 104269, 		-- Thundering Onyx Cloud Serpent
-		[148618] = 104325, 		-- Tyrannical Gladiator's Cloud Serpent
-		[148619] = 104326, 		-- Grievous Gladiator's Cloud Serpent
-		[148620] = 104327, 		-- Prideful Gladiator's Cloud Serpent
-		[148626] = 104329, 		-- Furious Ashhide Mushan
-		[148970] = NO_ITEM_ID, 		-- Felsteed
-		[148972] = NO_ITEM_ID, 		-- Dreadsteed
-		[149801] = 106246, 		-- Emerald Hippogryph
-		[153489] = 107951, 		-- Iron Skyreaver
-		[155741] = 109013, 		-- Dread Raven
-		[163024] = 112326, 		-- Warforged Nightmare
-		[163025] = 112327, 		-- Grinning Reaver
-		[169952] = 115363, 		-- Creeping Carpet
-		[170347] = 115484, 		-- Core Hound
-		[171436] = 116383, 		-- Gorestrider Gronnling
-		[171616] = 116655, 		-- Witherhide Cliffstomper
-		[171617] = 116656, 		-- Trained Icehoof
-		[171618] = 116657, 		-- Ancient Leatherhide
-		[171619] = 116658, 		-- Tundra Icehoof
-		[171620] = 116659, 		-- Bloodhoof Bull
-		[171621] = 116660, 		-- Ironhoof Destroyer
-		[171622] = 116661, 		-- Mottled Meadowstomper
-		[171623] = 116662, 		-- Trained Meadowstomper
-		[171624] = 116663, 		-- Shadowhide Pearltusk
-		[171625] = 116664, 		-- Dusty Rockhide
-		[171626] = 116665, 		-- Armored Irontusk
-		[171627] = 116666, 		-- Blacksteel Battleboar
-		[171628] = 116667, 		-- Rocktusk Battleboar
-		[171629] = 116668, 		-- Armored Frostboar
-		[171630] = 116669, 		-- Armored Razorback
-		[171632] = 116670, 		-- Frostplains Battleboar
-		[171633] = 116671, 		-- Wild Goretusk
-		[171634] = 116672, 		-- Domesticated Razorback
-		[171635] = 116673, 		-- Giant Coldsnout
-		[171636] = 116674, 		-- Great Greytusk
-		[171637] = 116675, 		-- Trained Rocktusk
-		[171638] = 116676, 		-- Trained Riverwallow
-		[171824] = 116767, 		-- Sapphire Riverbeast
-		[171825] = 116768, 		-- Mosshide Riverwallow
-		[171826] = 116769, 		-- Mudback Riverbeast
-		[171827] = 137575,		-- Hellfire Infernal
-		[171828] = 116771, 		-- Solar Spirehawk
-		[171829] = 116772, 		-- Shadowmane Charger
-		[171830] = 116773, 		-- Swift Breezestrider
-		[171831] = 116774, 		-- Trained Silverpelt
-		[171832] = 116775, 		-- Breezestrider Stallion
-		[171833] = 116776, 		-- Pale Thorngrazer
-		[171834] = 116777, 		-- Vicious War Ram
-		[171835] = 116778, 		-- Vicious War Raptor
-		[171836] = 116779, 		-- Garn Steelmaw
-		[171837] = 116780, 		-- Warsong Direfang
-		[171838] = 116781, 		-- Armored Frostwolf
-		[171839] = 116782, 		-- Ironside Warwolf
-		[171841] = 116784, 		-- Trained Snarler
-		[171842] = 116785, 		-- Swift Frostwolf
-		[171843] = 116786, 		-- Smoky Direwolf
-		[171844] = 108883, 		-- Dustmane Direwolf
-		[171845] = 116788, 		-- Warlord's Deathwheel
-		[171846] = 116789, 		-- Champion's Treadblade
-		[171847] = 118515, 		-- Cindermane Charger
-		[171848] = 116791, 		-- Challenger's War Yeti
-		[171849] = 116792, 		-- Sunhide Gronnling
-		[171850] = 137573,		-- Llothien Prowler
-		[171851] = 116794, 		-- Garn Nighthowl
-		[175700] = 118676, 		-- Emerald Drake
-		[179244] = 122703,		-- Summon Chauffeur
-		[179245] = 120968,		-- Summon Chauffeur
-		[179478] = 121815, 		-- Voidtalon of the Dark Star
-		[180545] = 122469, 		-- Mystic Runesaber
-		[182912] = 123890, 		-- Felsteel Annihilator
-		[183117] = 123974, 		-- Corrupted Dreadwing
-		[183889] = 124089, 		-- Vicious War Mechanostrider
-		[185052] = 124540, 		-- Vicious War Kodo
-		[186305] = 127140, 		-- Infernal Direwolf
-		[186828] = 128277, 		-- Primal Gladiator's Felblood Gronnling
-		[189043] = 128281, 		-- Wild Gladiator's Felblood Gronnling
-		[189044] = 128282, 		-- Warmongering Gladiator's Felblood Gronnling
-		[189364] = 128311, 		-- Coalfist Gronnling
-		[189998] = 128425,		-- Illidari Felstalker
-		[189999] = 128422,		-- Grove Warden
-		[190690] = 128480, 		-- Bristling Hellboar
-		[190977] = 128526, 		-- Deathtusk Felboar
-		[191314] = 128671, 		-- Minion of Grumpus
-		[191633] = 128706, 		-- Soaring Skyterror
-		[193007] = 141216, 		-- Grove Defiler
-		[193695] = 129280,		-- Prestigious War Steed
-		[194046] = NO_ITEM_ID, 		-- Swift Spectral Rylak
-		[194464] = 129923, 		-- Eclipse Dragonhawk
-		[196681] = 131734, 		-- Spirit of Eche'ro
-		[200175] = NO_ITEM_ID, 		-- Felsaber
-		[201098] = 133543,		-- Infinite Timereaver
-		[204166] = 143864,		-- Prestigious War Wolf
-		[213115] = 137570,		-- Bloodfang Widow
-		[213134] = 137574,		-- Felblaze Infernal
-		[213158] = 137577, 		-- Predatory Bloodgazer
-		[213163] = 137578, 		-- Snowfeather Hunter
-		[213164] = 137579, 		-- Brilliant Direbeak
-		[213165] = 137580, 		-- Viridian Sharptalon
-		[213209] = 137686,		-- Steelbound Devourer
-		[213339] = 129962,		-- Great Northern Elderhorn
-		[213350] = 137614,		-- Frostshard Infernal
-		[214791] = 138811, 		-- Brinedeep Bottom-Feeder
-		[215159] = 138258,		-- Long-Forgotten Hippogryph
-		[215545] = 186479,		-- Mastercraft Gravewing
-		[215558] = 138387, 		-- Ratstallion
-		[221883] = NO_ITEM_ID, 		-- Divine Steed
-		[221885] = NO_ITEM_ID, 		-- Divine Steed
-		[221886] = NO_ITEM_ID, 		-- Divine Steed
-		[221887] = NO_ITEM_ID, 		-- Divine Steed
-		[222202] = 140228, 		-- Prestigious Bronze Courser
-		[222236] = 140230, 		-- Prestigious Royal Courser
-		[222237] = 140232, 		-- Prestigious Forest Courser
-		[222238] = 140233, 		-- Prestigious Ivory Courser
-		[222240] = 140408, 		-- Prestigious Azure Courser
-		[222241] = 140407, 		-- Prestigious Midnight Courser
-		[223018] = 138201, 		-- Fathom Dweller
-		[223341] = 140353, 		-- Vicious Gilnean Warhorse
-		[223354] = 140354, 		-- Vicious War Trike
-		[223363] = 140348, 		-- Vicious Warstrider
-		[223578] = 140350, 		-- Vicious War Elekk
-		[223814] = 140500, 		-- Mechanized Lumber Extractor
-		[225765] = 141217, 		-- Leyfeather Hippogryph
-		[227956] = 141713, 		-- Arcadian War Turtle
-		[227986] = 141843, 		-- Vindictive Gladiator's Storm Dragon
-		[227988] = 141844, 		-- Fearless Gladiator's Storm Dragon
-		[227989] = 141845, 		-- Cruel  Gladiator's Storm Dragon
-		[227991] = 141846, 		-- Ferocious Gladiator's Storm Dragon
-		[227994] = 141847, 		-- Fierce Gladiator's Storm Dragon
-		[227995] = 141848,		-- Dominant Gladiator's Storm Dragon
-		[228919] = 142398, 		-- Darkwater Skate
-		[229376] = NO_ITEM_ID, 		-- Archmage's Prismatic Disc
-		[229377] = NO_ITEM_ID, 		-- High Priest's Lightsworn Seeker
-		[229385] = 142225, 		-- Ban-Lu, Grandmaster's Companion
-		[229386] = 142227,		-- Huntmaster's Loyal Wolfhawk
-		[229387] = 142231,		-- Deathlord's Vilebrood Vanquisher
-		[229388] = 142232,		-- Battlelord's Bloodthirsty War Wyrm
-		[229417] = NO_ITEM_ID, 		-- Slayer's Felbroken Shrieker
-		[229438] = 142226,		-- Huntmaster's Fierce Wolfhawk
-		[229439] = 142228,		-- Huntmaster's Dire Wolfhawk
-		[229486] = 142235,		-- Vicious War Bear
-		[229487] = 142234, 		-- Vicious War Bear
-		[229499] = 142236,		-- Midnight
-		[229512] = 142237, 		-- Vicious War Lion
-		[230401] = 142369,		-- Ivory Hawkstrider
-		[230844] = 142403, 		-- Brawler's Burly Basilisk
-		[230987] = 142436, 		-- Arcanist's Manasaber
-		[230988] = 142437, 		-- Vicious War Scorpion
-		[231428] = 142552, 		-- Smoldering Ember Wyrm
-		[231434] = 143493,		-- Shadowblade's Murderous Omen
-		[231435] = 143502,		-- Highlord's Golden Charger
-		[231442] = 143489,		-- Farseer's Raging Tempest
-		[231523] = 143492,		-- Shadowblade's Lethal Omen
-		[231524] = 143491,		-- Shadowblade's Baneful Omen
-		[231525] = 143490,		-- Shadowblade's Crimson Omen
-		[231587] = 143503,		-- Highlord's Vengeful Charger
-		[231588] = 143504,		-- Highlord's Vigilant Charger
-		[231589] = 143505,		-- Highlord's Valorous Charger
-		[232405] = 143631, 		-- Primal Flamesaber
-		[232412] = NO_ITEM_ID, 		-- Netherlord's Chaotic Wrathsteed
-		[232519] = 143643, 		-- Abyss Worm
-		[232523] = 143648, 		-- Vicious War Turtle
-		[232525] = 143649,		-- Vicious War Turtle
-		[233364] = 143764, 		-- Leywoven Flying Carpet
-		[235764] = 152843,		-- Darkspore Mana Ray
-		[237285] = NO_ITEM_ID,		-- Hyena Mount White (PH)
-		[237286] = 163576,		-- Dune Scavenger
-		[237287] = 161773,		-- Alabaster Hyena
-		[237288] = 166417,		-- Reins of the Onyx War Hyena
-		[238452] = 143637,		-- Netherlord's Brimstone Wrathsteed
-		[238454] = 142233,		-- Netherlord's Accursed Wrathsteed
-		[239013] = 152788,		-- Lightforged Warframe
-		[239049] = 161215,		-- Obsidian Krolusk
-		[239363] = NO_ITEM_ID, 		-- Swift Spectral Hippogryph
-		[239766] = 151626,		-- Blue Qiraji War Tank
-		[239767] = 151625,		-- Red Qiraji War Tank
-		[239769] = NO_ITEM_ID,		-- Purple Qiraji War Tank
-		[239770] = NO_ITEM_ID,		-- Black Qiraji War Tank
-		[242305] = 152791,		-- Sable Ruinstrider
-		[242874] = 147807, 		-- Highmountain Elderhorn
-		[242875] = 147804, 		-- Wild Dreamrunner
-		[242881] = 147806, 		-- Cloudwing Hippogryph
-		[242882] = 147805, 		-- Valarjar Stormwing
-		[242896] = 152870,		-- Vicious War Fox
-		[242897] = 152869,		-- Vicious War Fox
-		[243025] = 147835, 		-- Riddler's Mind-Worm
-		[243201] = 153493,		-- Demonic Gladiator's Storm Dragon
-		[243512] = 147901,		-- Luminous Starseeker
-		[243651] = 152789,		-- Shackled Ur'zul
-		[243652] = 152790,		-- Vile Fiend
-		[243795] = 163575,		-- Leaping Veinseeker
-		[244712] = 161664,		-- Spectral Pterrorwing
-		[245723] = 151618,		-- Stormwind Skychaser
-		[245725] = 151617,		-- Orgrimmar Interceptor
-		[247402] = 151623,		-- Lucid Nightmare
-		[247448] = 153485,		-- Darkmoon Dirigible
-		[250735] = 163216,		-- Bloodgorged Crawg
-		[253004] = 152794,		-- Amethyst Ruinstrider
-		[253005] = 152795,		-- Beryl Ruinstrider
-		[253006] = 152793,		-- Russet Ruinstrider
-		[253007] = 152797,		-- Cerulean Ruinstrider
-		[253008] = 152796,		-- Umber Ruinstrider
-		[253058] = 152814,		-- Maddened Chaosrunner
-		[253087] = 152815,		-- Antoran Gloomhound
-		[253088] = 152816,		-- Antoran Charhound
-		[253106] = 152842,		-- Vibrant Mana Ray
-		[253107] = 152844,		-- Lambent Mana Ray
-		[253108] = 152841,		-- Felglow Mana Ray
-		[253109] = 152840,		-- Scintillating Mana Ray
-		[253639] = 152901,		-- Violet Spellwing
-		[253660] = 152903,		-- Biletooth Gnasher
-		[253661] = 152905,		-- Crimson Slavermaw
-		[253662] = 152904,		-- Acid Belcher
-		[253711] = 152912,		-- Pond Nettle
-		[254069] = 153042,		-- Glorious Felcrusher
-		[254258] = 153043,		-- Blessed Felcrusher
-		[254259] = 153044,		-- Avenging Felcrusher
-		[254260] = 153041,		-- Bleakhoof Ruinstrider
-		[254471] = NO_ITEM_ID,		-- Divine Steed
-		[254472] = NO_ITEM_ID,		-- Divine Steed
-		[254473] = NO_ITEM_ID,		-- Divine Steed
-		[254474] = NO_ITEM_ID,		-- Divine Steed
-		[254811] = 163586,		-- Squawks
-		[254812] = NO_ITEM_ID,		-- PH Giant Parrot (Blue)
-		[254813] = 159842,		-- Summon Sharkbait
-		[255695] = 153539,		-- Seabraid Stallion
-		[255696] = 153540,		-- Gilded Ravasaur
-		[256121] = NO_ITEM_ID,		-- PH Goblin Hovercraft (Blue)
-		[256123] = 153594,		-- Xiwyllag ATV
-		[256124] = NO_ITEM_ID,		-- PH Goblin Hovercraft (Red)
-		[256125] = NO_ITEM_ID,		-- PH Goblin Hovercraft (Green)
-		[258022] = 155656,		-- Lightforged Felcrusher
-		[258060] = 155662,		-- Highmountain Thunderhoof
-		[258845] = 156487,		-- Nightborne Manasaber
-		[259202] = 156486,		-- Starcursed Voidstrider
-		[259213] = 161911, 		-- Admiralty Stallion
-		[259395] = 156564,		-- Shu-Zen, the Divine Sentinel
-		[259740] = 163183,		-- Green Marsh Hopper
-		[259741] = 170069,		-- Honeyback Harvester
-		[260172] = 161912, 		-- Dapple Gray
-		[260173] = 161910, 		-- Smoky Charger
-		[260174] = 163574,		-- Terrified Pack Mule
-		[260175] = 163573,		-- Goldenmane
-		[261395] = 156798,		-- The Hivemind
-		[261433] = 163122,		-- Vicious War Basilisk
-		[261434] = 163121,		-- Vicious War Basilisk
-		[261437] = 161134, 		-- Mecha-Mogul Mk2
-		[262022] = 156879,		-- Dread Gladiator's Proto-Drake
-		[262023] = 156880,		-- Sinister Gladiator's Proto-Drake
-		[262024] = 156881,		-- Notorious Gladiator's Proto-Drake
-		[262025] = 156882,		-- Pale Gladiator's Proto-Drake
-		[262026] = 156883,		-- Green Gladiator's Proto-Drake
-		[262027] = 156884,		-- Corrupted Gladiator's Proto-Drake
-		[262028] = 156885,		-- Gold Gladiator's Proto-Drake
-		[263707] = 157870,		-- Zandalari Direhorn
-		[264058] = 163042,		-- Mighty Caravan Brutosaur
-		[266058] = 159921, 		-- Tomb Stalker
-		[266925] = 166745,		-- Siltwing Albatross
-		[267270] = 159146,		-- Kua'fon
-		[267274] = 143752,		-- Mag'har Direwolf
-		[270560] = 163124,		-- Vicious War Clefthoof
-		[271646] = 161331,		-- Dark Iron Core Hound
-		[272472] = 163128,		-- Undercity Plaguebat
-		[272481] = 163123,		-- Vicious War Riverbeast
-		[272770] = 160589,		-- The Dreadwake
-		[273541] = 160829,		-- Underrot Crawg
-		[274610] = 163127,		-- Teldrassil Hippogryph
-		[275623] = 161479,		-- Nazjatar Blood Serpent
-		[275837] = 161665, 		-- Cobalt Pterrordax
-		[275838] = 161666,		-- Captured Swampstalker
-		[275840] = 161667,		-- Voldunai Dunescraper
-		[275841] = 161774, 		-- Expedition Bloodswarmer
-		[275859] = 161908,		-- Dusky Waycrest Gryphon
-		[275866] = 161909,		-- Stormsong Coastwatcher
-		[275868] = 161879,		-- Proudmoore Sea Scout
-		[276111] = NO_ITEM_ID,		-- Divine Steed
-		[276112] = NO_ITEM_ID,		-- Divine Steed
-		[278656] = 163063,		-- Spectral Phoenix
-		[278803] = 163131,		-- Great Sea Ray
-		[278966] = 163186,		-- Tempestuous Skystallion
-		[278979] = 163585,		-- Surf Jelly
-		[279454] = 163577,		-- Conqueror's Scythemaw
-		[279456] = 163579,		-- Highland Mustang
-		[279457] = 163578,		-- Broken Highland Mustang
-		[279466] = 163584,		-- Twilight Avenger
-		[279467] = 163583,		-- Craghorn Chasm-Leaper
-		[279469] = 163582,		-- Qinsho's Eternal Hound
-		[279474] = 163589,		-- Palehide Direhorn
-		[279569] = 163644,		-- Swift Albino Raptor
-		[279608] = 163646,		-- Lil' Donkey
-		[279611] = 163645,		-- Skullripper
-		[279868] = 163706,		-- Witherbark Direwing
-		[280729] = 163981,		-- Frenzied Feltalon
-		[280730] = 163982,		-- Pureheart Courser
-		[281044] = 164250,		-- Prestigious Bloodforged Courser
-		[281554] = 164571,		-- Meat Wagon
-		[281887] = 165019,		-- Vicious Black Warsaber
-		[281888] = 173714,		-- Vicious White Warsaber
-		[281889] = 173713,		-- Vicious White Bonesteed
-		[281890] = 165020,		-- Vicious Black Bonesteed
-		[282682] = 164762,		-- Kul Tiran Charger
-		[288438] = 166428,		-- Blackpaw
-		[288495] = 166432,		-- Ashenvale Chimaera
-		[288499] = 166433,		-- Frightened Kodo
-		[288503] = 166434,		-- Umber Nightsaber
-		[288505] = 166435,		-- Kaldorei Nightsaber
-		[288506] = 166436,		-- Sandy Nightsaber
-		[288587] = 166442,		-- Blue Marsh Hopper
-		[288589] = 166443,		-- Yellow Marsh Hopper
-		[288711] = 166471,		-- Saltwater Seahorse
-		[288712] = 166470,		-- Stonehide Elderhorn
-		[288714] = 166469,		-- Bloodthirsty Dreadwing
-		[288720] = 166468,		-- Bloodgorged Hunter
-		[288721] = 166467,		-- Island Thunderscale
-		[288722] = 166466,		-- Risen Mare
-		[288735] = 166464,		-- Rubyshell Krolusk
-		[288736] = 166465,		-- Azureshell Krolusk
-		[288740] = 166463,		-- Priestess' Moonsaber
-		[289083] = 166518,		-- G.M.O.D.
-		[289101] = 166539,		-- Dazar'alor Windreaver
-		[289555] = 166705,		-- Glacial Tidestorm
-		[289639] = 166724,		-- Bruce
-		[290132] = 166776,		-- Sylverian Dreamer
-		[290133] = 166775,		-- Vulpine Familiar
-		[290134] = 166774,		-- Hogrus, Swine of Good Fortune
-		[290328] = 169162,		-- Wonderwing 2.0
-		[290718] = 168830,		-- Aerial Unit R-21/X
-		[291492] = 168823,		-- Rusty Mechanocrawler
-		[291538] = 167170,		-- Unshackled Waveray
-		[292407] = 167167,		-- Ankoan Waveray
-		[292419] = 167171,		-- Azshari Bloatray
-		[294038] = 169198,		-- Royal Snapdragon
-		[294039] = 169194,		-- Snapback Scuttler
-		[294143] = 167751,		-- X-995 Mechanocat
-		[294197] = 172012,		-- Obsidian Worldbreaker
-		[294568] = 167894,		-- Beastlord's Irontusk
-		[294569] = 167895,		-- Beastlord's Warwolf
-		[295386] = 168056,		-- Ironclad Frostclaw
-		[295387] = 168055,		-- Bloodflank Charger
-		[296788] = 168329,		-- Mechacycle Model W
-		[297157] = 168370,		-- Junkheap Drifter
-		[297560] = 168408,		-- Child of Torcali
-		[298367] = 174842,		-- Mollie
-		[299158] = 168826,		-- Mechagon Peacekeeper
-		[299159] = 168827,		-- Scrapforged Mechaspider
-		[299170] = 168829,		-- Rustbolt Resistor
-		[300146] = 169199,		-- Snapdragon Kelpstalker
-		[300147] = 169200,		-- Deepcoral Snapdragon
-		[300149] = 169163,		-- Silent Glider
-		[300150] = 169201,		-- Fabious
-		[300151] = 169203,		-- Inkscale Deepseeker
-		[300152] = NO_ITEM_ID,		-- Tidestallion
-		[300153] = 169202,		-- Crimson Tidestallion
-		[300154] = NO_ITEM_ID,		-- Tidestallion
-		[301841] = NO_ITEM_ID,		-- Kua'fon
-		[302143] = 174862,		-- Uncorrupted Voidwing
-		[302361] = NO_ITEM_ID,		-- Alabaster Stormtalon
-		[302362] = NO_ITEM_ID,		-- Alabaster Thunderwing
-		[302794] = NO_ITEM_ID,		-- Swift Spectral Fathom Ray
-		[302795] = NO_ITEM_ID,		-- Swift Spectral Magnetocraft
-		[302796] = NO_ITEM_ID,		-- Swift Spectral Armored Gryphon
-		[302797] = NO_ITEM_ID,		-- Swift Spectral Pterrordax
-		[303766] = NO_ITEM_ID,		-- Honeyback Drone
-		[303767] = NO_ITEM_ID,		-- Honeyback Hivemother
-		[305182] = 174654,		-- Black Serpent of N'Zoth
-		[305592] = 174067,		-- Mechagon Mechanostrider
-		[306421] = 172023,		-- Frostwolf Snarler
-		[306423] = 174066,		-- Caravan Hyena
-		[307256] = 173299,		-- Explorer's Jungle Hopper
-		[307263] = 173297,		-- Explorer's Dunetrekker
-		[307932] = NO_ITEM_ID,		-- Ensorcelled Everwyrm
-		[308078] = NO_ITEM_ID,		-- Squeakers, the Trickster
-		[308087] = NO_ITEM_ID,		-- Lucky Yun
-		[308250] = 172022,		-- Stormpike Battle Ram
-		[308814] = 174872,		-- Ny'alotha Allseer
-		[312751] = 173887,		-- Clutch of Ha-Li
-		[312753] = 180581,		-- Hopecrusher Gargon
-		[312754] = 180948,		-- Battle Gargon Vrednic
-		[312756] = NO_ITEM_ID,		-- PH Phalynx
-		[312758] = NO_ITEM_ID,		-- PH Epic Phalynx
-		[312759] = 180263,		-- Dreamlight Runestag
-		[312761] = 180721,		-- Enchanted Dreamlight Runestag
-		[312762] = 184167,		-- Mawsworn Soulhunter
-		[312763] = 183052,		-- Darkwarren Hardshell
-		[312765] = 180773,		-- Sundancer
-		[312767] = 180728,		-- Swift Gloomhoof
-		[312772] = NO_ITEM_ID,		-- Gilded Prowler
-		[312776] = 183617,		-- Chittering Animite
-		[312777] = 181316,		-- Silvertip Dredwing
-		[315014] = 174752,		-- Ivory Cloud Serpent
-		[315132] = NO_ITEM_ID,		-- Gargantuan Grrloc
-		[315427] = 174649,		-- Rajani Warserpent
-		[315847] = 174641,		-- Drake of the Four Winds
-		[315987] = 174653,		-- Mail Muncher
-		[316275] = 174753,		-- Waste Marauder
-		[316276] = 174754,		-- Wastewander Skyterror
-		[316337] = 174769,		-- Malevolent Drone
-		[316339] = 174771,		-- Shadowbarb Drone
-		[316340] = 174770,		-- Wicked Swarmer
-		[316343] = 174861,		-- Wriggling Parasite
-		[316493] = 174860,		-- Elusive Quickhoof
-		[316637] = 174836,		-- Awakened Mindborer
-		[316722] = 174841,		-- Ren's Stalwart Hound
-		[316723] = 174840,		-- Xinlao
-		[316802] = 174859,		-- Springfur Alpaca
-		[317177] = NO_ITEM_ID,		-- Sunwarmed Furline
-		[318051] = 180748,		-- Silky Shimmermoth
-		[318052] = 181817,		-- Deathbringer's Flayedwing
-		[326390] = NO_ITEM_ID,		-- Steamscale Incinerator
-		[327405] = 182081,		-- Colossal Slaughterclaw
-		[327407] = 184014,		-- Vicious War Spider
-		[327408] = 184013,		-- Vicious War Spider
-		[332243] = 180413,		-- Shadeleaf Runestag
-		[332244] = 180414,		-- Wakener's Runestag
-		[332245] = 180415,		-- Winterborn Runestag
-		[332246] = 180722,		-- Enchanted Shadeleaf Runestag
-		[332247] = 180723,		-- Enchanted Wakener's Runestag
-		[332248] = 180724,		-- Enchanted Winterborn Runestag
-		[332252] = 180727,		-- Shimmermist Runner
-		[332256] = 180729,		-- Duskflutter Ardenmoth
-		[332400] = 183937,		-- Sinful Gladiator's Soul Eater
-		[332455] = 182077,		-- War-Bred Tauralus
-		[332456] = 182076,		-- Plaguerot Tauralus
-		[332457] = 182075,		-- Bonehoof Tauralus
-		[332460] = 182074,		-- Chosen Tauralus
-		[332462] = 181822,		-- Armored War-Bred Tauralus
-		[332464] = 181821,		-- Armored Plaguerot Tauralus
-		[332466] = 181815,		-- Armored Bonehoof Tauralus
-		[332467] = 181820,		-- Armored Chosen Tauralus
-		[332478] = 182085,		-- Blisterback Bloodtusk
-		[332480] = 182084,		-- Gorespine
-		[332482] = 182083,		-- Bonecleaver's Skullboar
-		[332484] = 182082,		-- Lurid Bloodtusk
-		[332882] = 180461,		-- Horrid Dredwing
-		[332903] = 182596,		-- Rampart Screecher
-		[332904] = 185996,		-- Harvester's Dredwing
-		[332905] = 180582,		-- Endmire Flyer
-		[332908] = NO_ITEM_ID,		-- PH Devourer Mite (Green)
-		[332923] = 182954,		-- Inquisition Gargon
-		[332927] = 183715,		-- Sinfall Gargon
-		[332932] = 180945,		-- Crypt Gargon
-		[332949] = 182209,		-- Desire's Battle Gargon
-		[333021] = 182332,		-- Gravestone Battle Gargon
-		[333023] = 183798,		-- Battle Gargon Silessa
-		[333027] = 182589,		-- Loyal Gorger
-		[334352] = 180731,		-- Wildseed Cradle
-		[334364] = 180725,		-- Spinemaw Gladechewer
-		[334365] = 180726,		-- Pale Acidmaw
-		[334366] = 180730,		-- Wild Glimmerfur Prowler
-		[334382] = 180761,		-- Phalynx of Loyalty
-		[334386] = 180762,		-- Phalynx of Humility
-		[334391] = 180763,		-- Phalynx of Courage
-		[334398] = 180764,		-- Phalynx of Purity
-		[334403] = 180765,		-- Eternal Phalynx of Purity
-		[334406] = 180766,		-- Eternal Phalynx of Courage
-		[334408] = 180767,		-- Eternal Phalynx of Loyalty
-		[334409] = 180768,		-- Eternal Phalynx of Humility
-		[334433] = 180772,		-- Silverwind Larion
-		[334482] = 192557,		-- Restoration Deathwalker
-		[336036] = 181819,		-- Marrowfang
-		[336038] = 181818,		-- Callow Flayedwing
-		[336039] = 181300,		-- Gruesome Flayedwing
-		[336041] = 182078,		-- Bonesewn Fleshroc
-		[336042] = 182079,		-- Hulking Deathroc
-		[336045] = 182080,		-- Predatory Plagueroc
-		[336064] = 181317,		-- Dauntless Duskrunner
-		[339588] = 182614,		-- Sinrunner Blanchy
-		[339632] = 182650,		-- Arboreal Gulper
-		[339956] = 186655,		-- Mawsworn Charger
-		[339957] = 186653,		-- Hand of Hrestimorak
-		[340068] = 182717,		-- Sintouched Deathwalker
-		[340503] = 183053,		-- Umbral Scythehorn
-		[341639] = 183518,		-- Court Sinrunner
-		[341766] = 183615,		-- Warstitched Darkhound
-		[341776] = 183618,		-- Highwind Darkmane
-		[341821] = NO_ITEM_ID,		-- Snowstorm
-		[342334] = 183740,		-- Gilded Prowler
-		[342335] = 183741,		-- Ascended Skymane
-		[342666] = 183800,		-- Amber Ardenmoth
-		[342667] = 183801,		-- Vibrant Flutterwing
-		[342668] = 187666,		-- Desertwing Hunter
-		[342671] = 187639,		-- Pale Regal Cervid
-		[342677] = NO_ITEM_ID,		-- PH Progenitor Spider
-		[342678] = 187660,		-- Vespoid Flutterer
-		[342680] = 187676,		-- Deepstar Aurelid
-		[343550] = 186480,		-- Battle-Hardened Aquilon
-		[344228] = 184062,		-- Battle-Bound Warhound
-		[344574] = 184160,		-- Bulbous Necroray
-		[344575] = 184162,		-- Pestilent Necroray
-		[344576] = 184161,		-- Infested Necroray
-		[344577] = 184168,		-- Bound Shadehound
-		[344578] = 184166,		-- Corridor Creeper
-		[344659] = 184183,		-- Voracious Gorger
-		[346136] = NO_ITEM_ID,		-- Viridian Phase-Hunter
-		[346141] = NO_ITEM_ID,		-- Slime Serpent
-		[346554] = 186637,		-- Tazavesh Gearglider
-		[346718] = NO_ITEM_ID,		-- PH Wolf Serpent
-		[346719] = 187669,		-- Serenade
-		[347250] = 186489,		-- Lord of the Corpseflies
-		[347251] = 186648,		-- Soaring Razorwing
-		[347255] = 187680,		-- Vicious War Croaker
-		[347256] = 187681,		-- Vicious War Croaker
-		[347536] = 186641,		-- Tamed Mauler
-		[347810] = 186644,		-- Beryl Shardhide
-		[347812] = NO_ITEM_ID,		-- Sapphire Skyblazer
-		[347813] = NO_ITEM_ID,		-- Fireplume Phoenix
-		[348162] = NO_ITEM_ID,		-- Wandering Ancient
-		[348769] = 186179,		-- Vicious War Gorm
-		[348770] = 186178,		-- Vicious War Gorm
-		[349823] = 187642,		-- Vicious Warstalker
-		[349824] = 187644,		-- Vicious Warstalker
-		[349935] = NO_ITEM_ID,		-- Noble Elderhorn
-		[350219] = 192777,		-- Magmashell
-		[351195] = 186642,		-- Vengeance
-		[352309] = 185973,		-- Hand of Bahmethra
-		[352441] = 186000,		-- Wild Hunt Legsplitter
-		[352742] = 186103,		-- Undying Darkhound
-		[352926] = 192800,		-- Skyskin Hornstrider
-		[353036] = 186177,		-- Unchained Gladiator's Soul Eater
-		[353263] = 186638,		-- Cartel Master's Gearglider
-		[353264] = 186639,		-- Pilfered Gearglider
-		[353265] = 186640,		-- Silver Gearglider
-		[353856] = 186493,		-- Ardenweald Wilderling
-		[353857] = 186494,		-- Autumnal Wilderling
-		[353858] = 186495,		-- Winter Wilderling
-		[353859] = 186492,		-- Summer Wilderling
-		[353860] = 186491,		-- Spring Wilderling
-		[353866] = 186478,		-- Obsidian Gravewing
-		[353872] = 186476,		-- Sinfall Gravewing
-		[353873] = 186477,		-- Pale Gravewing
-		[353875] = 186482,		-- Elysian Aquilon
-		[353877] = 186483,		-- Forsworn Aquilon
-		[353880] = 186485,		-- Ascendant's Aquilon
-		[353883] = 186487,		-- Maldraxxian Corpsefly
-		[353884] = 186488,		-- Regal Corpsefly
-		[353885] = 186490,		-- Battlefield Swarmer
-		[354351] = 186656,		-- Sanctum Gloomcharger
-		[354352] = 186657,		-- Soulbound Gloomcharger
-		[354353] = 186659,		-- Fallen Charger
-		[354354] = 186713,		-- Hand of Nilganihmaht
-		[354355] = 186654,		-- Hand of Salaranga
-		[354356] = 186647,		-- Amber Shardhide
-		[354357] = 186645,		-- Crimson Shardhide
-		[354358] = 186646,		-- Darkmaul
-		[354359] = 186649,		-- Fierce Razorwing
-		[354360] = 186652,		-- Garnet Razorwing
-		[354361] = 186651,		-- Dusklight Razorwing
-		[354362] = 186643,		-- Wandering Arden Doe
-		[356488] = NO_ITEM_ID,		-- Sarge's Tale
-		[356501] = 187183,		-- Rampaging Mauler
-		[356802] = NO_ITEM_ID,		-- Holy Lightstrider
-		[358319] = 187525,		-- Soultwisted Deathwalker
-		[359013] = 187595,		-- Val'sharah Hippogryph
-		[359229] = 187629,		-- Heartlight Vombata
-		[359230] = 187630,		-- Curious Crystalsniffer
-		[359231] = 187631,		-- Darkened Vombata
-		[359232] = 187632,		-- Adorned Vombata
-		[359276] = 187640,		-- Anointed Protostag
-		[359277] = 187641,		-- Sundered Zerethsteed
-		[359278] = 187638,		-- Deathrunner
-		[359317] = NO_ITEM_ID,		-- Wen Lo, the River's Edge
-		[359318] = 188674,		-- Soaring Spelltome
-		[359364] = 187663,		-- Bronzewing Vespoid
-		[359366] = 187665,		-- Buzz
-		[359367] = 187664,		-- Forged Spiteflyer
-		[359372] = 187667,		-- Mawdapted Raptora
-		[359373] = 187668,		-- Raptora Swooper
-		[359376] = 187670,		-- Bronze Helicid
-		[359377] = 187671,		-- Unsuccessful Prototype Fleetpod
-		[359378] = 187672,		-- Scarlet Helicid
-		[359379] = 187675,		-- Shimmering Aurelid
-		[359381] = 187673,		-- Cryptic Aurelid
-		[359401] = 187677,		-- Genesis Crawler
-		[359402] = 187678,		-- Tarachnid Creeper
-		[359403] = 187679,		-- Ineffable Skitterer
-		[359407] = 187682,		-- Wastewarped Deathwalker
-		[359408] = 198821,		-- Divine Kiss of Ohn'ahra
-		[359409] = 198871,		-- Iskaara Trader's Ottuk
-		[359413] = 187683,		-- Goldplate Bufonid
-		[359545] = 190771,		-- Carcinized Zerethsteed
-		[359622] = 201440,		-- Liberated Slyvern
-		[359843] = NO_ITEM_ID,		-- Tangled Dreamweaver
-		[360954] = 194106,		-- Highland Drake
-		[363136] = 188696,		-- Colossal Ebonclaw Mawrat
-		[363178] = 188700,		-- Colossal Umbrahide Mawrat
-		[363297] = 188736,		-- Colossal Soulshredder Mawrat
-		[363608] = NO_ITEM_ID,		-- Divine Steed
-		[363701] = 188808,		-- Patient Bufonid
-		[363703] = 188809,		-- Prototype Leaper
-		[363706] = 188810,		-- Russet Bufonid
-		[365559] = 189507,		-- Cosmic Gladiator's Soul Eater
-		[366791] = 190170,		-- Jigglesworth Sr.
-		[367190] = NO_ITEM_ID,		-- JZB Test Mount
-		[367673] = 190580,		-- Heartbond Lupine
-		[367676] = 190581,		-- Nether-Gorged Greatwyrm
-		[368105] = 190765,		-- Colossal Plaguespew Mawrat
-		[368128] = 190766,		-- Colossal Wraithbound Mawrat
-		[368158] = 190768,		-- Zereth Overseer
-		[368896] = 194034,		-- Renewed Proto-Drake
-		[368899] = 194549,		-- Windborne Velocidrake
-		[368901] = 194521,		-- Cliffside Wylderdrake
-		[369666] = 191123,		-- Grimhowl
-		[370346] = 191290,		-- Eternal Gladiator's Soul Eater
-		[370620] = 191566,		-- Elusive Emerald Hawkstrider
-		[370770] = NO_ITEM_ID,		-- Tuskarr Shoreglider
-		[372995] = NO_ITEM_ID,		-- Swift Spectral Drake
-		[373859] = 192601,		-- Loyal Magmammoth
-		[374032] = 192761,		-- Tamed Skitterfly
-		[374034] = 192762,		-- Azure Skitterfly
-		[374048] = 192764,		-- Verdant Skitterfly
-		[374098] = 192775,		-- Stormhide Salamanther
-		[374138] = 192779,		-- Scorchpath
-		[374155] = 192784,		-- Shellack
-		[374162] = 192786,		-- Scrappy Worldsnail
-		[374196] = 192791,		-- Plainswalker Bearer
-		[374247] = 192799,		-- Lizi, Thunderspine Tramper
-		[374263] = 192804,		-- Restless Hornstrider
-		[374275] = 192806,		-- Raging Magmammoth
-		[376873] = 198870,		-- Otto
-		[376875] = 198872,		-- Brown Scouting Ottuk
-		[376879] = 198873,		-- Ivory Trader's Ottuk
-		[376880] = 200118,		-- Yellow Scouting Ottuk
-		[376910] = 201426,		-- Brown War Ottuk
-		[376912] = 198654,		-- Otterworldly Ottuk Carrier
-		[376913] = 201425,		-- Yellow War Ottuk
-		[377071] = 202086,		-- Crimson Gladiator's Drake
-		[381529] = NO_ITEM_ID,		-- Telix the Stormhorn
-		[384963] = 198808,		-- Guardian Vorquin
-		[385115] = 198810,		-- Majestic Armored Vorquin
-		[385131] = 198809,		-- Armored Vorquin Leystrider
-		[385134] = 198811,		-- Swift Armored Vorquin
-		[385266] = 198825,		-- Zenet Hatchling
-		[385738] = 201454,		-- Temperamental Skyclaw
-		[386452] = NO_ITEM_ID,		-- Frostbrood Proto-Wyrm
-		[387231] = 199412,		-- Hailstorm Armoredon
-		[387948] = NO_ITEM_ID,		-- [PH] Wind Proto-Drake
-		[394216] = 201702,		-- Crimson Vorquin
-		[394218] = 201704,		-- Sapphire Vorquin
-		[394219] = 201720,		-- Bronze Vorquin
-		[394220] = 201719,		-- Obsidian Vorquin
-		[394737] = 201789,		-- Vicious Sabertooth
-		[394738] = 201788,		-- Vicious Sabertooth
-		[395644] = 198821,		-- Divine Kiss of Ohn'ahra
+		[458] = 5656,    -- Brown Horse
+		[459] = NO_ITEM_ID, -- Gray Wolf
+		[468] = NO_ITEM_ID, -- White Stallion
+		[470] = 2411,    -- Black Stallion
+		[472] = 2414,    -- Pinto
+		[578] = NO_ITEM_ID, -- Black Wolf
+		[579] = NO_ITEM_ID, -- Red Wolf
+		[580] = 1132,    -- Timber Wolf
+		[581] = NO_ITEM_ID, -- Winter Wolf
+		[5784] = NO_ITEM_ID, -- Felsteed
+		[6648] = 5655,   -- Chestnut Mare
+		[6653] = 5665,   -- Dire Wolf
+		[6654] = 5668,   -- Brown Wolf
+		[6777] = 5864,   -- Gray Ram
+		[6896] = 13328,  -- Black Ram
+		[6898] = 5873,   -- White Ram
+		[6899] = 5872,   -- Brown Ram
+		[8394] = 8631,   -- Striped Frostsaber
+		[8395] = 8588,   -- Emerald Raptor
+		[8980] = NO_ITEM_ID, -- Skeletal Horse
+		[10789] = 8632,  -- Spotted Frostsaber
+		[10790] = NO_ITEM_ID, -- Tiger
+		[10793] = 8629,  -- Striped Nightsaber
+		[10795] = NO_ITEM_ID, -- Ivory Raptor
+		[10796] = 8591,  -- Turquoise Raptor
+		[10799] = 8592,  -- Violet Raptor
+		[10873] = 8563,  -- Red Mechanostrider
+		[10969] = 8595,  -- Blue Mechanostrider
+		[13819] = NO_ITEM_ID, -- Warhorse
+		[15779] = 13326, -- White Mechanostrider Mod B
+		[15780] = 13321, -- Green Mechanostrider
+		[16055] = 12303, -- Black Nightsaber
+		[16056] = 12302, -- Ancient Frostsaber
+		[16080] = 12330, -- Red Wolf
+		[16081] = 12351, -- Arctic Wolf
+		[16082] = 12354, -- Palomino
+		[16083] = 12353, -- White Stallion
+		[16084] = 8586,  -- Mottled Red Raptor
+		[17229] = 13086, -- Winterspring Frostsaber
+		[17450] = 13317, -- Ivory Raptor
+		[17453] = 13321, -- Green Mechanostrider
+		[17454] = 13322, -- Unpainted Mechanostrider
+		[17459] = 13327, -- Icy Blue Mechanostrider Mod A
+		[17460] = 13329, -- Frost Ram
+		[17461] = 13328, -- Black Ram
+		[17462] = 13331, -- Red Skeletal Horse
+		[17463] = 13332, -- Blue Skeletal Horse
+		[17464] = 13333, -- Brown Skeletal Horse
+		[17465] = 13334, -- Green Skeletal Warhorse
+		[17481] = 13335, -- Rivendare's Deathcharger
+		[18363] = NO_ITEM_ID, -- Riding Kodo
+		[18989] = 15277, -- Gray Kodo
+		[18990] = 15290, -- Brown Kodo
+		[18991] = 15292, -- Green Kodo
+		[18992] = 15293, -- Teal Kodo
+		[22717] = 29468, -- Black War Steed
+		[22718] = 29466, -- Black War Kodo
+		[22719] = 29465, -- Black Battlestrider
+		[22720] = 29467, -- Black War Ram
+		[22721] = 29472, -- Black War Raptor
+		[22722] = 29470, -- Red Skeletal Warhorse
+		[22723] = 29471, -- Black War Tiger
+		[22724] = 29469, -- Black War Wolf
+		[23161] = NO_ITEM_ID, -- Dreadsteed
+		[23214] = NO_ITEM_ID, -- Charger
+		[23219] = 18767, -- Swift Mistsaber
+		[23221] = 18766, -- Swift Frostsaber
+		[23222] = 18774, -- Swift Yellow Mechanostrider
+		[23223] = 18773, -- Swift White Mechanostrider
+		[23225] = 18772, -- Swift Green Mechanostrider
+		[23227] = 18776, -- Swift Palomino
+		[23228] = 18778, -- Swift White Steed
+		[23229] = 18777, -- Swift Brown Steed
+		[23238] = 18786, -- Swift Brown Ram
+		[23239] = 18787, -- Swift Gray Ram
+		[23240] = 18785, -- Swift White Ram
+		[23241] = 18788, -- Swift Blue Raptor
+		[23242] = 18789, -- Swift Olive Raptor
+		[23243] = 18790, -- Swift Orange Raptor
+		[23246] = 18791, -- Purple Skeletal Warhorse
+		[23247] = 18793, -- Great White Kodo
+		[23248] = 18795, -- Great Gray Kodo
+		[23249] = 18794, -- Great Brown Kodo
+		[23250] = 18796, -- Swift Brown Wolf
+		[23251] = 18797, -- Swift Timber Wolf
+		[23252] = 18798, -- Swift Gray Wolf
+		[23338] = 18902, -- Swift Stormsaber
+		[23509] = 19029, -- Frostwolf Howler
+		[23510] = 19030, -- Stormpike Battle Charger
+		[24242] = 19872, -- Swift Razzashi Raptor
+		[24252] = 19902, -- Swift Zulian Tiger
+		[25863] = NO_ITEM_ID, -- Black Qiraji Battle Tank
+		[25953] = 21218, -- Blue Qiraji Battle Tank
+		[26054] = 21321, -- Red Qiraji Battle Tank
+		[26055] = 21324, -- Yellow Qiraji Battle Tank
+		[26056] = 21323, -- Green Qiraji Battle Tank
+		[26655] = NO_ITEM_ID, -- Black Qiraji Battle Tank
+		[26656] = 21176, -- Black Qiraji Battle Tank
+		[28828] = NO_ITEM_ID, -- Nether Drake
+		[30174] = 23720, -- Riding Turtle
+		[32235] = 25470, -- Golden Gryphon
+		[32239] = 25471, -- Ebon Gryphon
+		[32240] = 25472, -- Snowy Gryphon
+		[32242] = 25473, -- Swift Blue Gryphon
+		[32243] = 25474, -- Tawny Wind Rider
+		[32244] = 25475, -- Blue Wind Rider
+		[32245] = 25476, -- Green Wind Rider
+		[32246] = 25477, -- Swift Red Wind Rider
+		[32289] = 25527, -- Swift Red Gryphon
+		[32290] = 25528, -- Swift Green Gryphon
+		[32292] = 25529, -- Swift Purple Gryphon
+		[32295] = 25531, -- Swift Green Wind Rider
+		[32296] = 25532, -- Swift Yellow Wind Rider
+		[32297] = 25533, -- Swift Purple Wind Rider
+		[32345] = NO_ITEM_ID, -- Peep the Phoenix Mount
+		[33630] = 8595,  -- Blue Mechanostrider
+		[33660] = 28936, -- Swift Pink Hawkstrider
+		[34406] = 28481, -- Brown Elekk
+		[34767] = NO_ITEM_ID, -- Thalassian Charger
+		[34769] = NO_ITEM_ID, -- Thalassian Warhorse
+		[34790] = 29228, -- Dark War Talbuk
+		[34795] = 28927, -- Red Hawkstrider
+		[34896] = 29102, -- Cobalt War Talbuk
+		[34897] = 29103, -- White War Talbuk
+		[34898] = 29104, -- Silver War Talbuk
+		[34899] = 29105, -- Tan War Talbuk
+		[35018] = 29222, -- Purple Hawkstrider
+		[35020] = 29220, -- Blue Hawkstrider
+		[35022] = 29221, -- Black Hawkstrider
+		[35025] = 29223, -- Swift Green Hawkstrider
+		[35027] = 29224, -- Swift Purple Hawkstrider
+		[35028] = 34129, -- Swift Warstrider
+		[35710] = 29744, -- Gray Elekk
+		[35711] = 29743, -- Purple Elekk
+		[35712] = 29746, -- Great Green Elekk
+		[35713] = 29745, -- Great Blue Elekk
+		[35714] = 29747, -- Great Purple Elekk
+		[36702] = 30480, -- Fiery Warhorse
+		[37015] = 30609, -- Swift Nether Drake
+		[39315] = 31829, -- Cobalt Riding Talbuk
+		[39316] = 28915, -- Dark Riding Talbuk
+		[39317] = 31831, -- Silver Riding Talbuk
+		[39318] = 31833, -- Tan Riding Talbuk
+		[39319] = 31835, -- White Riding Talbuk
+		[39798] = 32314, -- Green Riding Nether Ray
+		[39800] = 32317, -- Red Riding Nether Ray
+		[39801] = 32316, -- Purple Riding Nether Ray
+		[39802] = 32318, -- Silver Riding Nether Ray
+		[39803] = 32319, -- Blue Riding Nether Ray
+		[40192] = 32458, -- Ashes of Al'ar
+		[41252] = 32768, -- Raven Lord
+		[41513] = 32857, -- Onyx Netherwing Drake
+		[41514] = 32858, -- Azure Netherwing Drake
+		[41515] = 32859, -- Cobalt Netherwing Drake
+		[41516] = 32860, -- Purple Netherwing Drake
+		[41517] = 32861, -- Veridian Netherwing Drake
+		[41518] = 32862, -- Violet Netherwing Drake
+		[42776] = 49283, -- Spectral Tiger
+		[42777] = 49284, -- Swift Spectral Tiger
+		[43688] = 33809, -- Amani War Bear
+		[43899] = 33976, -- Brewfest Ram
+		[43900] = 33977, -- Swift Brewfest Ram
+		[43927] = 33999, -- Cenarion War Hippogryph
+		[44151] = 34061, -- Turbo-Charged Flying Machine
+		[44153] = 34060, -- Flying Machine
+		[44317] = 34092, -- Merciless Nether Drake
+		[44744] = 34092, -- Merciless Nether Drake
+		[46197] = 49285, -- X-51 Nether-Rocket
+		[46199] = 49286, -- X-51 Nether-Rocket X-TREME
+		[46628] = 35513, -- Swift White Hawkstrider
+		[48025] = 37012, -- Headless Horseman's Mount
+		[48027] = 35906, -- Black War Elekk
+		[48778] = NO_ITEM_ID, -- Acherus Deathcharger
+		[48954] = 37719, -- Swift Zhevra
+		[49193] = 37676, -- Vengeful Nether Drake
+		[49322] = 37719, -- Swift Zhevra
+		[49378] = NO_ITEM_ID, -- Brewfest Riding Kodo
+		[49379] = 37828, -- Great Brewfest Kodo
+		[50869] = NO_ITEM_ID, -- Brewfest Kodo
+		[51412] = 49282, -- Big Battle Bear
+		[54729] = 40775, -- Winged Steed of the Ebon Blade
+		[54753] = 43962, -- White Polar Bear
+		[55164] = NO_ITEM_ID, -- Swift Spectral Gryphon
+		[55531] = 41508, -- Mechano-Hog
+		[58615] = 43516, -- Brutal Nether Drake
+		[58819] = NO_ITEM_ID, -- Swift Brown Steed
+		[58983] = 43599, -- Big Blizzard Bear
+		[59567] = 43952, -- Azure Drake
+		[59568] = 43953, -- Blue Drake
+		[59569] = 43951, -- Bronze Drake
+		[59570] = 43955, -- Red Drake
+		[59571] = 43954, -- Twilight Drake
+		[59572] = NO_ITEM_ID, -- Black Polar Bear
+		[59650] = 43986, -- Black Drake
+		[59785] = 43956, -- Black War Mammoth
+		[59788] = 44077, -- Black War Mammoth
+		[59791] = 44230, -- Wooly Mammoth
+		[59793] = 44231, -- Wooly Mammoth
+		[59797] = 44080, -- Ice Mammoth
+		[59799] = 43958, -- Ice Mammoth
+		[59961] = 44160, -- Red Proto-Drake
+		[59976] = 44164, -- Black Proto-Drake
+		[59996] = 44151, -- Blue Proto-Drake
+		[60002] = 44168, -- Time-Lost Proto-Drake
+		[60021] = 44175, -- Plagued Proto-Drake
+		[60024] = 44177, -- Violet Proto-Drake
+		[60025] = 44178, -- Albino Drake
+		[60114] = 44225, -- Armored Brown Bear
+		[60116] = 44226, -- Armored Brown Bear
+		[60118] = 44223, -- Black War Bear
+		[60119] = 44224, -- Black War Bear
+		[60136] = NO_ITEM_ID, -- Grand Caravan Mammoth
+		[60140] = NO_ITEM_ID, -- Grand Caravan Mammoth
+		[60424] = 44413, -- Mekgineer's Chopper
+		[61229] = 44689, -- Armored Snowy Gryphon
+		[61230] = 44690, -- Armored Blue Wind Rider
+		[61294] = 44707, -- Green Proto-Drake
+		[61309] = 44558, -- Magnificent Flying Carpet
+		[61425] = 44235, -- Traveler's Tundra Mammoth
+		[61447] = 44234, -- Traveler's Tundra Mammoth
+		[61451] = 44554, -- Flying Carpet
+		[61465] = 43959, -- Grand Black War Mammoth
+		[61467] = 44083, -- Grand Black War Mammoth
+		[61469] = 44086, -- Grand Ice Mammoth
+		[61470] = 43961, -- Grand Ice Mammoth
+		[61996] = 44843, -- Blue Dragonhawk
+		[61997] = 44842, -- Red Dragonhawk
+		[62048] = 186469, -- Black Dragonhawk Mount
+		[63232] = 45125, -- Stormwind Steed
+		[63635] = 45593, -- Darkspear Raptor
+		[63636] = 45586, -- Ironforge Ram
+		[63637] = 45591, -- Darnassian Nightsaber
+		[63638] = 45589, -- Gnomeregan Mechanostrider
+		[63639] = 45590, -- Exodar Elekk
+		[63640] = 45595, -- Orgrimmar Wolf
+		[63641] = 45592, -- Thunder Bluff Kodo
+		[63642] = 45596, -- Silvermoon Hawkstrider
+		[63643] = 45597, -- Forsaken Warhorse
+		[63796] = 45693, -- Mimiron's Head
+		[63844] = 45725, -- Argent Hippogryph
+		[63956] = 45801, -- Ironbound Proto-Drake
+		[63963] = 45802, -- Rusted Proto-Drake
+		[64656] = NO_ITEM_ID, -- Blue Skeletal Warhorse
+		[64657] = 46100, -- White Kodo
+		[64658] = 46099, -- Black Wolf
+		[64659] = 46102, -- Venomhide Ravasaur
+		[64731] = 46109, -- Sea Turtle
+		[64927] = 46708, -- Deadly Gladiator's Frost Wyrm
+		[64977] = 46308, -- Black Skeletal Horse
+		[65439] = 46171, -- Furious Gladiator's Frost Wyrm
+		[65637] = 46745, -- Great Red Elekk
+		[65638] = 46744, -- Swift Moonsaber
+		[65639] = 46751, -- Swift Red Hawkstrider
+		[65640] = 46752, -- Swift Gray Steed
+		[65641] = 46750, -- Great Golden Kodo
+		[65642] = 46747, -- Turbostrider
+		[65643] = 46748, -- Swift Violet Ram
+		[65644] = 46743, -- Swift Purple Raptor
+		[65645] = 46746, -- White Skeletal Warhorse
+		[65646] = 46749, -- Swift Burgundy Wolf
+		[65917] = 49290, -- Magic Rooster
+		[66087] = 46813, -- Silver Covenant Hippogryph
+		[66088] = 46814, -- Sunreaver Dragonhawk
+		[66090] = 46815, -- Quel'dorei Steed
+		[66091] = 46816, -- Sunreaver Hawkstrider
+		[66122] = NO_ITEM_ID, -- Magic Rooster
+		[66123] = NO_ITEM_ID, -- Magic Rooster
+		[66124] = NO_ITEM_ID, -- Magic Rooster
+		[66846] = 47101, -- Ochre Skeletal Warhorse
+		[66847] = 47100, -- Striped Dawnsaber
+		[66906] = 47179, -- Argent Charger
+		[66907] = 47180, -- Argent Warhorse
+		[67336] = 47840, -- Relentless Gladiator's Frost Wyrm
+		[67466] = 47180, -- Argent Warhorse
+		[68056] = 49046, -- Swift Horde Wolf
+		[68057] = 49044, -- Swift Alliance Steed
+		[68187] = 49096, -- Crusader's White Warhorse
+		[68188] = 49098, -- Crusader's Black Warhorse
+		[69395] = 49636, -- Onyxian Drake
+		[69820] = NO_ITEM_ID, -- Sunwalker Kodo
+		[69826] = NO_ITEM_ID, -- Great Sunwalker Kodo
+		[71342] = 50250, -- X-45 Heartbreaker
+		[71810] = 50435, -- Wrathful Gladiator's Frost Wyrm
+		[72286] = 50818, -- Invincible
+		[72807] = 51955, -- Icebound Frostbrood Vanquisher
+		[72808] = 51954, -- Bloodbathed Frostbrood Vanquisher
+		[73313] = 52200, -- Crimson Deathcharger
+		[73629] = NO_ITEM_ID, -- Exarch's Elekk
+		[73630] = NO_ITEM_ID, -- Great Exarch's Elekk
+		[74856] = 54069, -- Blazing Hippogryph
+		[74918] = 54068, -- Wooly White Rhino
+		[75207] = 54465, -- Vashj'ir Seahorse
+		[75596] = 54797, -- Frosty Flying Carpet
+		[75614] = 54811, -- Celestial Steed
+		[75973] = 54860, -- X-53 Touring Rocket
+		[84751] = 60954, -- Fossilized Raptor
+		[87090] = 62461, -- Goblin Trike
+		[87091] = 62462, -- Goblin Turbo-Trike
+		[88331] = 62900, -- Volcanic Stone Drake
+		[88335] = 62901, -- Drake of the East Wind
+		[88718] = 63042, -- Phosphorescent Stone Drake
+		[88741] = 63039, -- Drake of the West Wind
+		[88742] = 63040, -- Drake of the North Wind
+		[88744] = 63041, -- Drake of the South Wind
+		[88746] = 63043, -- Vitreous Stone Drake
+		[88748] = 63044, -- Brown Riding Camel
+		[88749] = 63045, -- Tan Riding Camel
+		[88750] = 63046, -- Grey Riding Camel
+		[88990] = 63125, -- Dark Phoenix
+		[89520] = NO_ITEM_ID, -- Goblin Mini Hotrod
+		[90621] = 62298, -- Golden King
+		[92155] = 64883, -- Ultramarine Qiraji Battle Tank
+		[92231] = 64998, -- Spectral Steed
+		[92232] = 64999, -- Spectral Wolf
+		[93326] = 65891, -- Sandstone Drake
+		[93623] = 68008, -- Mottled Drake
+		[93644] = 67107, -- Kor'kron Annihilator
+		[96491] = 68823, -- Armored Razzashi Raptor
+		[96499] = 68824, -- Swift Zulian Panther
+		[96503] = 68825, -- Amani Dragonhawk
+		[97359] = 69213, -- Flameward Hippogryph
+		[97493] = 69224, -- Pureblood Fire Hawk
+		[97501] = 69226, -- Felfire Hawk
+		[97560] = 69230, -- Corrupted Fire Hawk
+		[97581] = 69228, -- Savage Raptor
+		[98204] = 69747, -- Amani Battle Bear
+		[98718] = 67151, -- Subdued Seahorse
+		[98727] = 69846, -- Winged Guardian
+		[100332] = 70909, -- Vicious War Steed
+		[100333] = 70910, -- Vicious War Wolf
+		[101282] = 71339, -- Vicious Gladiator's Twilight Drake
+		[101542] = 71665, -- Flametalon of Alysrazor
+		[101573] = 71718, -- Swift Shorestrider
+		[101821] = 71954, -- Ruthless Gladiator's Twilight Drake
+		[102346] = 72140, -- Swift Forest Strider
+		[102349] = 72145, -- Swift Springstrider
+		[102350] = 72146, -- Swift Lovebird
+		[102488] = 72575, -- White Riding Camel
+		[102514] = 72582, -- Corrupted Hippogryph
+		[103081] = 73766, -- Darkmoon Dancing Bear
+		[103195] = 73838, -- Mountain Horse
+		[103196] = 73839, -- Swift Mountain Horse
+		[107203] = 76755, -- Tyrael's Charger
+		[107516] = 76889, -- Spectral Gryphon
+		[107517] = 76902, -- Spectral Wind Rider
+		[107842] = 77067, -- Blazing Drake
+		[107844] = 77068, -- Twilight Harbinger
+		[107845] = 77069, -- Life-Binder's Handmaiden
+		[110039] = 78919, -- Experiment 12-B
+		[110051] = 78924, -- Heart of the Aspects
+		[113120] = 79771, -- Feldrake
+		[113199] = 79802, -- Jade Cloud Serpent
+		[118089] = 81354, -- Azure Water Strider
+		[118737] = 81559, -- Pandaren Kite
+		[120043] = 82453, -- Jeweled Onyx Panther
+		[120395] = 82765, -- Green Dragon Turtle
+		[120822] = 82811, -- Great Red Dragon Turtle
+		[121820] = 83086, -- Obsidian Nightwing
+		[121836] = 83090, -- Sapphire Panther
+		[121837] = 83088, -- Jade Panther
+		[121838] = 83087, -- Ruby Panther
+		[121839] = 83089, -- Sunstone Panther
+		[122708] = 84101, -- Grand Expedition Yak
+		[123160] = NO_ITEM_ID, -- Crimson Riding Crane
+		[123182] = NO_ITEM_ID, -- White Riding Yak
+		[123886] = 85262, -- Amber Scorpion
+		[123992] = 85430, -- Azure Cloud Serpent
+		[123993] = 85429, -- Golden Cloud Serpent
+		[124408] = 85666, -- Thundering Jade Cloud Serpent
+		[124550] = 85785, -- Cataclysmic Gladiator's Twilight Drake
+		[124659] = 85870, -- Imperial Quilen
+		[126507] = 87250, -- Depleted-Kyparium Rocket
+		[126508] = 87251, -- Geosynchronous World Spinner
+		[127154] = 87768, -- Onyx Cloud Serpent
+		[127156] = 87769, -- Crimson Cloud Serpent
+		[127158] = 87771, -- Heavenly Onyx Cloud Serpent
+		[127161] = 87773, -- Heavenly Crimson Cloud Serpent
+		[127164] = 87774, -- Heavenly Golden Cloud Serpent
+		[127165] = 87775, -- Yu'lei, Daughter of Jade
+		[127169] = 87776, -- Heavenly Azure Cloud Serpent
+		[127170] = 87777, -- Astral Cloud Serpent
+		[127174] = 87781, -- Azure Riding Crane
+		[127176] = 87782, -- Golden Riding Crane
+		[127177] = 87783, -- Regal Riding Crane
+		[127178] = NO_ITEM_ID, -- Jungle Riding Crane
+		[127180] = NO_ITEM_ID, -- Albino Riding Crane
+		[127209] = NO_ITEM_ID, -- Black Riding Yak
+		[127213] = NO_ITEM_ID, -- Brown Riding Yak
+		[127216] = 87788, -- Grey Riding Yak
+		[127220] = 87789, -- Blonde Riding Yak
+		[127271] = 87791, -- Crimson Water Strider
+		[127272] = NO_ITEM_ID, -- Orange Water Strider
+		[127274] = NO_ITEM_ID, -- Jade Water Strider
+		[127278] = NO_ITEM_ID, -- Golden Water Strider
+		[127286] = 87795, -- Black Dragon Turtle
+		[127287] = 87796, -- Blue Dragon Turtle
+		[127288] = 87797, -- Brown Dragon Turtle
+		[127289] = 87799, -- Purple Dragon Turtle
+		[127290] = 87800, -- Red Dragon Turtle
+		[127293] = 87801, -- Great Green Dragon Turtle
+		[127295] = 87802, -- Great Black Dragon Turtle
+		[127302] = 87803, -- Great Blue Dragon Turtle
+		[127308] = 87804, -- Great Brown Dragon Turtle
+		[127310] = 87805, -- Great Purple Dragon Turtle
+		[129552] = 89154, -- Crimson Pandaren Phoenix
+		[129918] = 89304, -- Thundering August Cloud Serpent
+		[129932] = 89305, -- Green Shado-Pan Riding Tiger
+		[129934] = 89307, -- Blue Shado-Pan Riding Tiger
+		[129935] = 89306, -- Red Shado-Pan Riding Tiger
+		[130086] = 89362, -- Brown Riding Goat
+		[130092] = 89363, -- Red Flying Cloud
+		[130137] = 89390, -- White Riding Goat
+		[130138] = 89391, -- Black Riding Goat
+		[130965] = 89783, -- Son of Galleon
+		[130985] = 89785, -- Pandaren Kite
+		[132036] = 90655, -- Thundering Ruby Cloud Serpent
+		[132117] = 90710, -- Ashen Pandaren Phoenix
+		[132118] = 90711, -- Emerald Pandaren Phoenix
+		[132119] = 90712, -- Violet Pandaren Phoenix
+		[133023] = 91802, -- Jade Pandaren Kite
+		[134359] = 95416, -- Sky Golem
+		[134573] = 92724, -- Swift Windsteed
+		[135416] = 93168, -- Grand Armored Gryphon
+		[135418] = 93169, -- Grand Armored Wyvern
+		[136163] = 93385, -- Grand Gryphon
+		[136164] = 93386, -- Grand Wyvern
+		[136400] = 93662, -- Armored Skyscreamer
+		[136471] = 93666, -- Spawn of Horridon
+		[136505] = 93671, -- Ghastly Charger
+		[138423] = 94228, -- Cobalt Primordial Direhorn
+		[138424] = 94230, -- Amber Primordial Direhorn
+		[138425] = 94229, -- Slate Primordial Direhorn
+		[138426] = 94231, -- Jade Primordial Direhorn
+		[138640] = 94290, -- Bone-White Primal Raptor
+		[138641] = 94291, -- Red Primal Raptor
+		[138642] = 94292, -- Black Primal Raptor
+		[138643] = 94293, -- Green Primal Raptor
+		[139407] = 95041, -- Malevolent Gladiator's Cloud Serpent
+		[139442] = 95057, -- Thundering Cobalt Cloud Serpent
+		[139448] = 95059, -- Clutch of Ji-Kun
+		[139595] = 95341, -- Armored Bloodwing
+		[140249] = 95564, -- Golden Primal Direhorn
+		[140250] = 95565, -- Crimson Primal Direhorn
+		[142073] = 98618, -- Hearthsteed
+		[142266] = 98104, -- Armored Red Dragonhawk
+		[142478] = 98259, -- Armored Blue Dragonhawk
+		[142641] = 98405, -- Brawler's Burly Mushan Beast
+		[142878] = 97989, -- Enchanted Fey Dragon
+		[142910] = 129744, -- Ironbound Wraithcharger
+		[146615] = 102514, -- Vicious Kaldorei Warsaber
+		[146622] = 102533, -- Vicious Skeletal Warhorse
+		[147595] = 104011, -- Stormcrow
+		[148392] = 104208, -- Spawn of Galakras
+		[148396] = 104246, -- Kor'kron War Wolf
+		[148417] = 104253, -- Kor'kron Juggernaut
+		[148428] = 103638, -- Ashhide Mushan Beast
+		[148476] = 104269, -- Thundering Onyx Cloud Serpent
+		[148618] = 104325, -- Tyrannical Gladiator's Cloud Serpent
+		[148619] = 104326, -- Grievous Gladiator's Cloud Serpent
+		[148620] = 104327, -- Prideful Gladiator's Cloud Serpent
+		[148626] = 104329, -- Furious Ashhide Mushan
+		[148970] = NO_ITEM_ID, -- Felsteed
+		[148972] = NO_ITEM_ID, -- Dreadsteed
+		[149801] = 106246, -- Emerald Hippogryph
+		[153489] = 107951, -- Iron Skyreaver
+		[155741] = 109013, -- Dread Raven
+		[163024] = 112326, -- Warforged Nightmare
+		[163025] = 112327, -- Grinning Reaver
+		[169952] = 115363, -- Creeping Carpet
+		[170347] = 115484, -- Core Hound
+		[171436] = 116383, -- Gorestrider Gronnling
+		[171616] = 116655, -- Witherhide Cliffstomper
+		[171617] = 116656, -- Trained Icehoof
+		[171618] = 116657, -- Ancient Leatherhide
+		[171619] = 116658, -- Tundra Icehoof
+		[171620] = 116659, -- Bloodhoof Bull
+		[171621] = 116660, -- Ironhoof Destroyer
+		[171622] = 116661, -- Mottled Meadowstomper
+		[171623] = 116662, -- Trained Meadowstomper
+		[171624] = 116663, -- Shadowhide Pearltusk
+		[171625] = 116664, -- Dusty Rockhide
+		[171626] = 116665, -- Armored Irontusk
+		[171627] = 116666, -- Blacksteel Battleboar
+		[171628] = 116667, -- Rocktusk Battleboar
+		[171629] = 116668, -- Armored Frostboar
+		[171630] = 116669, -- Armored Razorback
+		[171632] = 116670, -- Frostplains Battleboar
+		[171633] = 116671, -- Wild Goretusk
+		[171634] = 116672, -- Domesticated Razorback
+		[171635] = 116673, -- Giant Coldsnout
+		[171636] = 116674, -- Great Greytusk
+		[171637] = 116675, -- Trained Rocktusk
+		[171638] = 116676, -- Trained Riverwallow
+		[171824] = 116767, -- Sapphire Riverbeast
+		[171825] = 116768, -- Mosshide Riverwallow
+		[171826] = 116769, -- Mudback Riverbeast
+		[171827] = 137575, -- Hellfire Infernal
+		[171828] = 116771, -- Solar Spirehawk
+		[171829] = 116772, -- Shadowmane Charger
+		[171830] = 116773, -- Swift Breezestrider
+		[171831] = 116774, -- Trained Silverpelt
+		[171832] = 116775, -- Breezestrider Stallion
+		[171833] = 116776, -- Pale Thorngrazer
+		[171834] = 116777, -- Vicious War Ram
+		[171835] = 116778, -- Vicious War Raptor
+		[171836] = 116779, -- Garn Steelmaw
+		[171837] = 116780, -- Warsong Direfang
+		[171838] = 116781, -- Armored Frostwolf
+		[171839] = 116782, -- Ironside Warwolf
+		[171841] = 116784, -- Trained Snarler
+		[171842] = 116785, -- Swift Frostwolf
+		[171843] = 116786, -- Smoky Direwolf
+		[171844] = 108883, -- Dustmane Direwolf
+		[171845] = 116788, -- Warlord's Deathwheel
+		[171846] = 116789, -- Champion's Treadblade
+		[171847] = 118515, -- Cindermane Charger
+		[171848] = 116791, -- Challenger's War Yeti
+		[171849] = 116792, -- Sunhide Gronnling
+		[171850] = 137573, -- Llothien Prowler
+		[171851] = 116794, -- Garn Nighthowl
+		[175700] = 118676, -- Emerald Drake
+		[179244] = 122703, -- Summon Chauffeur
+		[179245] = 120968, -- Summon Chauffeur
+		[179478] = 121815, -- Voidtalon of the Dark Star
+		[180545] = 122469, -- Mystic Runesaber
+		[182912] = 123890, -- Felsteel Annihilator
+		[183117] = 123974, -- Corrupted Dreadwing
+		[183889] = 124089, -- Vicious War Mechanostrider
+		[185052] = 124540, -- Vicious War Kodo
+		[186305] = 127140, -- Infernal Direwolf
+		[186828] = 128277, -- Primal Gladiator's Felblood Gronnling
+		[189043] = 128281, -- Wild Gladiator's Felblood Gronnling
+		[189044] = 128282, -- Warmongering Gladiator's Felblood Gronnling
+		[189364] = 128311, -- Coalfist Gronnling
+		[189998] = 128425, -- Illidari Felstalker
+		[189999] = 128422, -- Grove Warden
+		[190690] = 128480, -- Bristling Hellboar
+		[190977] = 128526, -- Deathtusk Felboar
+		[191314] = 128671, -- Minion of Grumpus
+		[191633] = 128706, -- Soaring Skyterror
+		[193007] = 141216, -- Grove Defiler
+		[193695] = 129280, -- Prestigious War Steed
+		[194046] = NO_ITEM_ID, -- Swift Spectral Rylak
+		[194464] = 129923, -- Eclipse Dragonhawk
+		[196681] = 131734, -- Spirit of Eche'ro
+		[200175] = NO_ITEM_ID, -- Felsaber
+		[201098] = 133543, -- Infinite Timereaver
+		[204166] = 143864, -- Prestigious War Wolf
+		[213115] = 137570, -- Bloodfang Widow
+		[213134] = 137574, -- Felblaze Infernal
+		[213158] = 137577, -- Predatory Bloodgazer
+		[213163] = 137578, -- Snowfeather Hunter
+		[213164] = 137579, -- Brilliant Direbeak
+		[213165] = 137580, -- Viridian Sharptalon
+		[213209] = 137686, -- Steelbound Devourer
+		[213339] = 129962, -- Great Northern Elderhorn
+		[213350] = 137614, -- Frostshard Infernal
+		[214791] = 138811, -- Brinedeep Bottom-Feeder
+		[215159] = 138258, -- Long-Forgotten Hippogryph
+		[215545] = 186479, -- Mastercraft Gravewing
+		[215558] = 138387, -- Ratstallion
+		[221883] = NO_ITEM_ID, -- Divine Steed
+		[221885] = NO_ITEM_ID, -- Divine Steed
+		[221886] = NO_ITEM_ID, -- Divine Steed
+		[221887] = NO_ITEM_ID, -- Divine Steed
+		[222202] = 140228, -- Prestigious Bronze Courser
+		[222236] = 140230, -- Prestigious Royal Courser
+		[222237] = 140232, -- Prestigious Forest Courser
+		[222238] = 140233, -- Prestigious Ivory Courser
+		[222240] = 140408, -- Prestigious Azure Courser
+		[222241] = 140407, -- Prestigious Midnight Courser
+		[223018] = 138201, -- Fathom Dweller
+		[223341] = 140353, -- Vicious Gilnean Warhorse
+		[223354] = 140354, -- Vicious War Trike
+		[223363] = 140348, -- Vicious Warstrider
+		[223578] = 140350, -- Vicious War Elekk
+		[223814] = 140500, -- Mechanized Lumber Extractor
+		[225765] = 141217, -- Leyfeather Hippogryph
+		[227956] = 141713, -- Arcadian War Turtle
+		[227986] = 141843, -- Vindictive Gladiator's Storm Dragon
+		[227988] = 141844, -- Fearless Gladiator's Storm Dragon
+		[227989] = 141845, -- Cruel  Gladiator's Storm Dragon
+		[227991] = 141846, -- Ferocious Gladiator's Storm Dragon
+		[227994] = 141847, -- Fierce Gladiator's Storm Dragon
+		[227995] = 141848, -- Dominant Gladiator's Storm Dragon
+		[228919] = 142398, -- Darkwater Skate
+		[229376] = NO_ITEM_ID, -- Archmage's Prismatic Disc
+		[229377] = NO_ITEM_ID, -- High Priest's Lightsworn Seeker
+		[229385] = 142225, -- Ban-Lu, Grandmaster's Companion
+		[229386] = 142227, -- Huntmaster's Loyal Wolfhawk
+		[229387] = 142231, -- Deathlord's Vilebrood Vanquisher
+		[229388] = 142232, -- Battlelord's Bloodthirsty War Wyrm
+		[229417] = NO_ITEM_ID, -- Slayer's Felbroken Shrieker
+		[229438] = 142226, -- Huntmaster's Fierce Wolfhawk
+		[229439] = 142228, -- Huntmaster's Dire Wolfhawk
+		[229486] = 142235, -- Vicious War Bear
+		[229487] = 142234, -- Vicious War Bear
+		[229499] = 142236, -- Midnight
+		[229512] = 142237, -- Vicious War Lion
+		[230401] = 142369, -- Ivory Hawkstrider
+		[230844] = 142403, -- Brawler's Burly Basilisk
+		[230987] = 142436, -- Arcanist's Manasaber
+		[230988] = 142437, -- Vicious War Scorpion
+		[231428] = 142552, -- Smoldering Ember Wyrm
+		[231434] = 143493, -- Shadowblade's Murderous Omen
+		[231435] = 143502, -- Highlord's Golden Charger
+		[231442] = 143489, -- Farseer's Raging Tempest
+		[231523] = 143492, -- Shadowblade's Lethal Omen
+		[231524] = 143491, -- Shadowblade's Baneful Omen
+		[231525] = 143490, -- Shadowblade's Crimson Omen
+		[231587] = 143503, -- Highlord's Vengeful Charger
+		[231588] = 143504, -- Highlord's Vigilant Charger
+		[231589] = 143505, -- Highlord's Valorous Charger
+		[232405] = 143631, -- Primal Flamesaber
+		[232412] = NO_ITEM_ID, -- Netherlord's Chaotic Wrathsteed
+		[232519] = 143643, -- Abyss Worm
+		[232523] = 143648, -- Vicious War Turtle
+		[232525] = 143649, -- Vicious War Turtle
+		[233364] = 143764, -- Leywoven Flying Carpet
+		[235764] = 152843, -- Darkspore Mana Ray
+		[237285] = NO_ITEM_ID, -- Hyena Mount White (PH)
+		[237286] = 163576, -- Dune Scavenger
+		[237287] = 161773, -- Alabaster Hyena
+		[237288] = 166417, -- Reins of the Onyx War Hyena
+		[238452] = 143637, -- Netherlord's Brimstone Wrathsteed
+		[238454] = 142233, -- Netherlord's Accursed Wrathsteed
+		[239013] = 152788, -- Lightforged Warframe
+		[239049] = 161215, -- Obsidian Krolusk
+		[239363] = NO_ITEM_ID, -- Swift Spectral Hippogryph
+		[239766] = 151626, -- Blue Qiraji War Tank
+		[239767] = 151625, -- Red Qiraji War Tank
+		[239769] = NO_ITEM_ID, -- Purple Qiraji War Tank
+		[239770] = NO_ITEM_ID, -- Black Qiraji War Tank
+		[242305] = 152791, -- Sable Ruinstrider
+		[242874] = 147807, -- Highmountain Elderhorn
+		[242875] = 147804, -- Wild Dreamrunner
+		[242881] = 147806, -- Cloudwing Hippogryph
+		[242882] = 147805, -- Valarjar Stormwing
+		[242896] = 152870, -- Vicious War Fox
+		[242897] = 152869, -- Vicious War Fox
+		[243025] = 147835, -- Riddler's Mind-Worm
+		[243201] = 153493, -- Demonic Gladiator's Storm Dragon
+		[243512] = 147901, -- Luminous Starseeker
+		[243651] = 152789, -- Shackled Ur'zul
+		[243652] = 152790, -- Vile Fiend
+		[243795] = 163575, -- Leaping Veinseeker
+		[244712] = 161664, -- Spectral Pterrorwing
+		[245723] = 151618, -- Stormwind Skychaser
+		[245725] = 151617, -- Orgrimmar Interceptor
+		[247402] = 151623, -- Lucid Nightmare
+		[247448] = 153485, -- Darkmoon Dirigible
+		[250735] = 163216, -- Bloodgorged Crawg
+		[253004] = 152794, -- Amethyst Ruinstrider
+		[253005] = 152795, -- Beryl Ruinstrider
+		[253006] = 152793, -- Russet Ruinstrider
+		[253007] = 152797, -- Cerulean Ruinstrider
+		[253008] = 152796, -- Umber Ruinstrider
+		[253058] = 152814, -- Maddened Chaosrunner
+		[253087] = 152815, -- Antoran Gloomhound
+		[253088] = 152816, -- Antoran Charhound
+		[253106] = 152842, -- Vibrant Mana Ray
+		[253107] = 152844, -- Lambent Mana Ray
+		[253108] = 152841, -- Felglow Mana Ray
+		[253109] = 152840, -- Scintillating Mana Ray
+		[253639] = 152901, -- Violet Spellwing
+		[253660] = 152903, -- Biletooth Gnasher
+		[253661] = 152905, -- Crimson Slavermaw
+		[253662] = 152904, -- Acid Belcher
+		[253711] = 152912, -- Pond Nettle
+		[254069] = 153042, -- Glorious Felcrusher
+		[254258] = 153043, -- Blessed Felcrusher
+		[254259] = 153044, -- Avenging Felcrusher
+		[254260] = 153041, -- Bleakhoof Ruinstrider
+		[254471] = NO_ITEM_ID, -- Divine Steed
+		[254472] = NO_ITEM_ID, -- Divine Steed
+		[254473] = NO_ITEM_ID, -- Divine Steed
+		[254474] = NO_ITEM_ID, -- Divine Steed
+		[254811] = 163586, -- Squawks
+		[254812] = NO_ITEM_ID, -- PH Giant Parrot (Blue)
+		[254813] = 159842, -- Summon Sharkbait
+		[255695] = 153539, -- Seabraid Stallion
+		[255696] = 153540, -- Gilded Ravasaur
+		[256121] = NO_ITEM_ID, -- PH Goblin Hovercraft (Blue)
+		[256123] = 153594, -- Xiwyllag ATV
+		[256124] = NO_ITEM_ID, -- PH Goblin Hovercraft (Red)
+		[256125] = NO_ITEM_ID, -- PH Goblin Hovercraft (Green)
+		[258022] = 155656, -- Lightforged Felcrusher
+		[258060] = 155662, -- Highmountain Thunderhoof
+		[258845] = 156487, -- Nightborne Manasaber
+		[259202] = 156486, -- Starcursed Voidstrider
+		[259213] = 161911, -- Admiralty Stallion
+		[259395] = 156564, -- Shu-Zen, the Divine Sentinel
+		[259740] = 163183, -- Green Marsh Hopper
+		[259741] = 170069, -- Honeyback Harvester
+		[260172] = 161912, -- Dapple Gray
+		[260173] = 161910, -- Smoky Charger
+		[260174] = 163574, -- Terrified Pack Mule
+		[260175] = 163573, -- Goldenmane
+		[261395] = 156798, -- The Hivemind
+		[261433] = 163122, -- Vicious War Basilisk
+		[261434] = 163121, -- Vicious War Basilisk
+		[261437] = 161134, -- Mecha-Mogul Mk2
+		[262022] = 156879, -- Dread Gladiator's Proto-Drake
+		[262023] = 156880, -- Sinister Gladiator's Proto-Drake
+		[262024] = 156881, -- Notorious Gladiator's Proto-Drake
+		[262025] = 156882, -- Pale Gladiator's Proto-Drake
+		[262026] = 156883, -- Green Gladiator's Proto-Drake
+		[262027] = 156884, -- Corrupted Gladiator's Proto-Drake
+		[262028] = 156885, -- Gold Gladiator's Proto-Drake
+		[263707] = 157870, -- Zandalari Direhorn
+		[264058] = 163042, -- Mighty Caravan Brutosaur
+		[266058] = 159921, -- Tomb Stalker
+		[266925] = 166745, -- Siltwing Albatross
+		[267270] = 159146, -- Kua'fon
+		[267274] = 143752, -- Mag'har Direwolf
+		[270560] = 163124, -- Vicious War Clefthoof
+		[271646] = 161331, -- Dark Iron Core Hound
+		[272472] = 163128, -- Undercity Plaguebat
+		[272481] = 163123, -- Vicious War Riverbeast
+		[272770] = 160589, -- The Dreadwake
+		[273541] = 160829, -- Underrot Crawg
+		[274610] = 163127, -- Teldrassil Hippogryph
+		[275623] = 161479, -- Nazjatar Blood Serpent
+		[275837] = 161665, -- Cobalt Pterrordax
+		[275838] = 161666, -- Captured Swampstalker
+		[275840] = 161667, -- Voldunai Dunescraper
+		[275841] = 161774, -- Expedition Bloodswarmer
+		[275859] = 161908, -- Dusky Waycrest Gryphon
+		[275866] = 161909, -- Stormsong Coastwatcher
+		[275868] = 161879, -- Proudmoore Sea Scout
+		[276111] = NO_ITEM_ID, -- Divine Steed
+		[276112] = NO_ITEM_ID, -- Divine Steed
+		[278656] = 163063, -- Spectral Phoenix
+		[278803] = 163131, -- Great Sea Ray
+		[278966] = 163186, -- Tempestuous Skystallion
+		[278979] = 163585, -- Surf Jelly
+		[279454] = 163577, -- Conqueror's Scythemaw
+		[279456] = 163579, -- Highland Mustang
+		[279457] = 163578, -- Broken Highland Mustang
+		[279466] = 163584, -- Twilight Avenger
+		[279467] = 163583, -- Craghorn Chasm-Leaper
+		[279469] = 163582, -- Qinsho's Eternal Hound
+		[279474] = 163589, -- Palehide Direhorn
+		[279569] = 163644, -- Swift Albino Raptor
+		[279608] = 163646, -- Lil' Donkey
+		[279611] = 163645, -- Skullripper
+		[279868] = 163706, -- Witherbark Direwing
+		[280729] = 163981, -- Frenzied Feltalon
+		[280730] = 163982, -- Pureheart Courser
+		[281044] = 164250, -- Prestigious Bloodforged Courser
+		[281554] = 164571, -- Meat Wagon
+		[281887] = 165019, -- Vicious Black Warsaber
+		[281888] = 173714, -- Vicious White Warsaber
+		[281889] = 173713, -- Vicious White Bonesteed
+		[281890] = 165020, -- Vicious Black Bonesteed
+		[282682] = 164762, -- Kul Tiran Charger
+		[288438] = 166428, -- Blackpaw
+		[288495] = 166432, -- Ashenvale Chimaera
+		[288499] = 166433, -- Frightened Kodo
+		[288503] = 166434, -- Umber Nightsaber
+		[288505] = 166435, -- Kaldorei Nightsaber
+		[288506] = 166436, -- Sandy Nightsaber
+		[288587] = 166442, -- Blue Marsh Hopper
+		[288589] = 166443, -- Yellow Marsh Hopper
+		[288711] = 166471, -- Saltwater Seahorse
+		[288712] = 166470, -- Stonehide Elderhorn
+		[288714] = 166469, -- Bloodthirsty Dreadwing
+		[288720] = 166468, -- Bloodgorged Hunter
+		[288721] = 166467, -- Island Thunderscale
+		[288722] = 166466, -- Risen Mare
+		[288735] = 166464, -- Rubyshell Krolusk
+		[288736] = 166465, -- Azureshell Krolusk
+		[288740] = 166463, -- Priestess' Moonsaber
+		[289083] = 166518, -- G.M.O.D.
+		[289101] = 166539, -- Dazar'alor Windreaver
+		[289555] = 166705, -- Glacial Tidestorm
+		[289639] = 166724, -- Bruce
+		[290132] = 166776, -- Sylverian Dreamer
+		[290133] = 166775, -- Vulpine Familiar
+		[290134] = 166774, -- Hogrus, Swine of Good Fortune
+		[290328] = 169162, -- Wonderwing 2.0
+		[290718] = 168830, -- Aerial Unit R-21/X
+		[291492] = 168823, -- Rusty Mechanocrawler
+		[291538] = 167170, -- Unshackled Waveray
+		[292407] = 167167, -- Ankoan Waveray
+		[292419] = 167171, -- Azshari Bloatray
+		[294038] = 169198, -- Royal Snapdragon
+		[294039] = 169194, -- Snapback Scuttler
+		[294143] = 167751, -- X-995 Mechanocat
+		[294197] = 172012, -- Obsidian Worldbreaker
+		[294568] = 167894, -- Beastlord's Irontusk
+		[294569] = 167895, -- Beastlord's Warwolf
+		[295386] = 168056, -- Ironclad Frostclaw
+		[295387] = 168055, -- Bloodflank Charger
+		[296788] = 168329, -- Mechacycle Model W
+		[297157] = 168370, -- Junkheap Drifter
+		[297560] = 168408, -- Child of Torcali
+		[298367] = 174842, -- Mollie
+		[299158] = 168826, -- Mechagon Peacekeeper
+		[299159] = 168827, -- Scrapforged Mechaspider
+		[299170] = 168829, -- Rustbolt Resistor
+		[300146] = 169199, -- Snapdragon Kelpstalker
+		[300147] = 169200, -- Deepcoral Snapdragon
+		[300149] = 169163, -- Silent Glider
+		[300150] = 169201, -- Fabious
+		[300151] = 169203, -- Inkscale Deepseeker
+		[300152] = NO_ITEM_ID, -- Tidestallion
+		[300153] = 169202, -- Crimson Tidestallion
+		[300154] = NO_ITEM_ID, -- Tidestallion
+		[301841] = NO_ITEM_ID, -- Kua'fon
+		[302143] = 174862, -- Uncorrupted Voidwing
+		[302361] = NO_ITEM_ID, -- Alabaster Stormtalon
+		[302362] = NO_ITEM_ID, -- Alabaster Thunderwing
+		[302794] = NO_ITEM_ID, -- Swift Spectral Fathom Ray
+		[302795] = NO_ITEM_ID, -- Swift Spectral Magnetocraft
+		[302796] = NO_ITEM_ID, -- Swift Spectral Armored Gryphon
+		[302797] = NO_ITEM_ID, -- Swift Spectral Pterrordax
+		[303766] = NO_ITEM_ID, -- Honeyback Drone
+		[303767] = NO_ITEM_ID, -- Honeyback Hivemother
+		[305182] = 174654, -- Black Serpent of N'Zoth
+		[305592] = 174067, -- Mechagon Mechanostrider
+		[306421] = 172023, -- Frostwolf Snarler
+		[306423] = 174066, -- Caravan Hyena
+		[307256] = 173299, -- Explorer's Jungle Hopper
+		[307263] = 173297, -- Explorer's Dunetrekker
+		[307932] = NO_ITEM_ID, -- Ensorcelled Everwyrm
+		[308078] = NO_ITEM_ID, -- Squeakers, the Trickster
+		[308087] = NO_ITEM_ID, -- Lucky Yun
+		[308250] = 172022, -- Stormpike Battle Ram
+		[308814] = 174872, -- Ny'alotha Allseer
+		[312751] = 173887, -- Clutch of Ha-Li
+		[312753] = 180581, -- Hopecrusher Gargon
+		[312754] = 180948, -- Battle Gargon Vrednic
+		[312756] = NO_ITEM_ID, -- PH Phalynx
+		[312758] = NO_ITEM_ID, -- PH Epic Phalynx
+		[312759] = 180263, -- Dreamlight Runestag
+		[312761] = 180721, -- Enchanted Dreamlight Runestag
+		[312762] = 184167, -- Mawsworn Soulhunter
+		[312763] = 183052, -- Darkwarren Hardshell
+		[312765] = 180773, -- Sundancer
+		[312767] = 180728, -- Swift Gloomhoof
+		[312772] = NO_ITEM_ID, -- Gilded Prowler
+		[312776] = 183617, -- Chittering Animite
+		[312777] = 181316, -- Silvertip Dredwing
+		[315014] = 174752, -- Ivory Cloud Serpent
+		[315132] = NO_ITEM_ID, -- Gargantuan Grrloc
+		[315427] = 174649, -- Rajani Warserpent
+		[315847] = 174641, -- Drake of the Four Winds
+		[315987] = 174653, -- Mail Muncher
+		[316275] = 174753, -- Waste Marauder
+		[316276] = 174754, -- Wastewander Skyterror
+		[316337] = 174769, -- Malevolent Drone
+		[316339] = 174771, -- Shadowbarb Drone
+		[316340] = 174770, -- Wicked Swarmer
+		[316343] = 174861, -- Wriggling Parasite
+		[316493] = 174860, -- Elusive Quickhoof
+		[316637] = 174836, -- Awakened Mindborer
+		[316722] = 174841, -- Ren's Stalwart Hound
+		[316723] = 174840, -- Xinlao
+		[316802] = 174859, -- Springfur Alpaca
+		[317177] = NO_ITEM_ID, -- Sunwarmed Furline
+		[318051] = 180748, -- Silky Shimmermoth
+		[318052] = 181817, -- Deathbringer's Flayedwing
+		[326390] = NO_ITEM_ID, -- Steamscale Incinerator
+		[327405] = 182081, -- Colossal Slaughterclaw
+		[327407] = 184014, -- Vicious War Spider
+		[327408] = 184013, -- Vicious War Spider
+		[332243] = 180413, -- Shadeleaf Runestag
+		[332244] = 180414, -- Wakener's Runestag
+		[332245] = 180415, -- Winterborn Runestag
+		[332246] = 180722, -- Enchanted Shadeleaf Runestag
+		[332247] = 180723, -- Enchanted Wakener's Runestag
+		[332248] = 180724, -- Enchanted Winterborn Runestag
+		[332252] = 180727, -- Shimmermist Runner
+		[332256] = 180729, -- Duskflutter Ardenmoth
+		[332400] = 183937, -- Sinful Gladiator's Soul Eater
+		[332455] = 182077, -- War-Bred Tauralus
+		[332456] = 182076, -- Plaguerot Tauralus
+		[332457] = 182075, -- Bonehoof Tauralus
+		[332460] = 182074, -- Chosen Tauralus
+		[332462] = 181822, -- Armored War-Bred Tauralus
+		[332464] = 181821, -- Armored Plaguerot Tauralus
+		[332466] = 181815, -- Armored Bonehoof Tauralus
+		[332467] = 181820, -- Armored Chosen Tauralus
+		[332478] = 182085, -- Blisterback Bloodtusk
+		[332480] = 182084, -- Gorespine
+		[332482] = 182083, -- Bonecleaver's Skullboar
+		[332484] = 182082, -- Lurid Bloodtusk
+		[332882] = 180461, -- Horrid Dredwing
+		[332903] = 182596, -- Rampart Screecher
+		[332904] = 185996, -- Harvester's Dredwing
+		[332905] = 180582, -- Endmire Flyer
+		[332908] = NO_ITEM_ID, -- PH Devourer Mite (Green)
+		[332923] = 182954, -- Inquisition Gargon
+		[332927] = 183715, -- Sinfall Gargon
+		[332932] = 180945, -- Crypt Gargon
+		[332949] = 182209, -- Desire's Battle Gargon
+		[333021] = 182332, -- Gravestone Battle Gargon
+		[333023] = 183798, -- Battle Gargon Silessa
+		[333027] = 182589, -- Loyal Gorger
+		[334352] = 180731, -- Wildseed Cradle
+		[334364] = 180725, -- Spinemaw Gladechewer
+		[334365] = 180726, -- Pale Acidmaw
+		[334366] = 180730, -- Wild Glimmerfur Prowler
+		[334382] = 180761, -- Phalynx of Loyalty
+		[334386] = 180762, -- Phalynx of Humility
+		[334391] = 180763, -- Phalynx of Courage
+		[334398] = 180764, -- Phalynx of Purity
+		[334403] = 180765, -- Eternal Phalynx of Purity
+		[334406] = 180766, -- Eternal Phalynx of Courage
+		[334408] = 180767, -- Eternal Phalynx of Loyalty
+		[334409] = 180768, -- Eternal Phalynx of Humility
+		[334433] = 180772, -- Silverwind Larion
+		[334482] = 192557, -- Restoration Deathwalker
+		[336036] = 181819, -- Marrowfang
+		[336038] = 181818, -- Callow Flayedwing
+		[336039] = 181300, -- Gruesome Flayedwing
+		[336041] = 182078, -- Bonesewn Fleshroc
+		[336042] = 182079, -- Hulking Deathroc
+		[336045] = 182080, -- Predatory Plagueroc
+		[336064] = 181317, -- Dauntless Duskrunner
+		[339588] = 182614, -- Sinrunner Blanchy
+		[339632] = 182650, -- Arboreal Gulper
+		[339956] = 186655, -- Mawsworn Charger
+		[339957] = 186653, -- Hand of Hrestimorak
+		[340068] = 182717, -- Sintouched Deathwalker
+		[340503] = 183053, -- Umbral Scythehorn
+		[341639] = 183518, -- Court Sinrunner
+		[341766] = 183615, -- Warstitched Darkhound
+		[341776] = 183618, -- Highwind Darkmane
+		[341821] = NO_ITEM_ID, -- Snowstorm
+		[342334] = 183740, -- Gilded Prowler
+		[342335] = 183741, -- Ascended Skymane
+		[342666] = 183800, -- Amber Ardenmoth
+		[342667] = 183801, -- Vibrant Flutterwing
+		[342668] = 187666, -- Desertwing Hunter
+		[342671] = 187639, -- Pale Regal Cervid
+		[342677] = NO_ITEM_ID, -- PH Progenitor Spider
+		[342678] = 187660, -- Vespoid Flutterer
+		[342680] = 187676, -- Deepstar Aurelid
+		[343550] = 186480, -- Battle-Hardened Aquilon
+		[344228] = 184062, -- Battle-Bound Warhound
+		[344574] = 184160, -- Bulbous Necroray
+		[344575] = 184162, -- Pestilent Necroray
+		[344576] = 184161, -- Infested Necroray
+		[344577] = 184168, -- Bound Shadehound
+		[344578] = 184166, -- Corridor Creeper
+		[344659] = 184183, -- Voracious Gorger
+		[346136] = NO_ITEM_ID, -- Viridian Phase-Hunter
+		[346141] = NO_ITEM_ID, -- Slime Serpent
+		[346554] = 186637, -- Tazavesh Gearglider
+		[346718] = NO_ITEM_ID, -- PH Wolf Serpent
+		[346719] = 187669, -- Serenade
+		[347250] = 186489, -- Lord of the Corpseflies
+		[347251] = 186648, -- Soaring Razorwing
+		[347255] = 187680, -- Vicious War Croaker
+		[347256] = 187681, -- Vicious War Croaker
+		[347536] = 186641, -- Tamed Mauler
+		[347810] = 186644, -- Beryl Shardhide
+		[347812] = NO_ITEM_ID, -- Sapphire Skyblazer
+		[347813] = NO_ITEM_ID, -- Fireplume Phoenix
+		[348162] = NO_ITEM_ID, -- Wandering Ancient
+		[348769] = 186179, -- Vicious War Gorm
+		[348770] = 186178, -- Vicious War Gorm
+		[349823] = 187642, -- Vicious Warstalker
+		[349824] = 187644, -- Vicious Warstalker
+		[349935] = NO_ITEM_ID, -- Noble Elderhorn
+		[350219] = 192777, -- Magmashell
+		[351195] = 186642, -- Vengeance
+		[352309] = 185973, -- Hand of Bahmethra
+		[352441] = 186000, -- Wild Hunt Legsplitter
+		[352742] = 186103, -- Undying Darkhound
+		[352926] = 192800, -- Skyskin Hornstrider
+		[353036] = 186177, -- Unchained Gladiator's Soul Eater
+		[353263] = 186638, -- Cartel Master's Gearglider
+		[353264] = 186639, -- Pilfered Gearglider
+		[353265] = 186640, -- Silver Gearglider
+		[353856] = 186493, -- Ardenweald Wilderling
+		[353857] = 186494, -- Autumnal Wilderling
+		[353858] = 186495, -- Winter Wilderling
+		[353859] = 186492, -- Summer Wilderling
+		[353860] = 186491, -- Spring Wilderling
+		[353866] = 186478, -- Obsidian Gravewing
+		[353872] = 186476, -- Sinfall Gravewing
+		[353873] = 186477, -- Pale Gravewing
+		[353875] = 186482, -- Elysian Aquilon
+		[353877] = 186483, -- Forsworn Aquilon
+		[353880] = 186485, -- Ascendant's Aquilon
+		[353883] = 186487, -- Maldraxxian Corpsefly
+		[353884] = 186488, -- Regal Corpsefly
+		[353885] = 186490, -- Battlefield Swarmer
+		[354351] = 186656, -- Sanctum Gloomcharger
+		[354352] = 186657, -- Soulbound Gloomcharger
+		[354353] = 186659, -- Fallen Charger
+		[354354] = 186713, -- Hand of Nilganihmaht
+		[354355] = 186654, -- Hand of Salaranga
+		[354356] = 186647, -- Amber Shardhide
+		[354357] = 186645, -- Crimson Shardhide
+		[354358] = 186646, -- Darkmaul
+		[354359] = 186649, -- Fierce Razorwing
+		[354360] = 186652, -- Garnet Razorwing
+		[354361] = 186651, -- Dusklight Razorwing
+		[354362] = 186643, -- Wandering Arden Doe
+		[356488] = NO_ITEM_ID, -- Sarge's Tale
+		[356501] = 187183, -- Rampaging Mauler
+		[356802] = NO_ITEM_ID, -- Holy Lightstrider
+		[358319] = 187525, -- Soultwisted Deathwalker
+		[359013] = 187595, -- Val'sharah Hippogryph
+		[359229] = 187629, -- Heartlight Vombata
+		[359230] = 187630, -- Curious Crystalsniffer
+		[359231] = 187631, -- Darkened Vombata
+		[359232] = 187632, -- Adorned Vombata
+		[359276] = 187640, -- Anointed Protostag
+		[359277] = 187641, -- Sundered Zerethsteed
+		[359278] = 187638, -- Deathrunner
+		[359317] = NO_ITEM_ID, -- Wen Lo, the River's Edge
+		[359318] = 188674, -- Soaring Spelltome
+		[359364] = 187663, -- Bronzewing Vespoid
+		[359366] = 187665, -- Buzz
+		[359367] = 187664, -- Forged Spiteflyer
+		[359372] = 187667, -- Mawdapted Raptora
+		[359373] = 187668, -- Raptora Swooper
+		[359376] = 187670, -- Bronze Helicid
+		[359377] = 187671, -- Unsuccessful Prototype Fleetpod
+		[359378] = 187672, -- Scarlet Helicid
+		[359379] = 187675, -- Shimmering Aurelid
+		[359381] = 187673, -- Cryptic Aurelid
+		[359401] = 187677, -- Genesis Crawler
+		[359402] = 187678, -- Tarachnid Creeper
+		[359403] = 187679, -- Ineffable Skitterer
+		[359407] = 187682, -- Wastewarped Deathwalker
+		[359408] = 198821, -- Divine Kiss of Ohn'ahra
+		[359409] = 198871, -- Iskaara Trader's Ottuk
+		[359413] = 187683, -- Goldplate Bufonid
+		[359545] = 190771, -- Carcinized Zerethsteed
+		[359622] = 201440, -- Liberated Slyvern
+		[359843] = NO_ITEM_ID, -- Tangled Dreamweaver
+		[360954] = 194106, -- Highland Drake
+		[363136] = 188696, -- Colossal Ebonclaw Mawrat
+		[363178] = 188700, -- Colossal Umbrahide Mawrat
+		[363297] = 188736, -- Colossal Soulshredder Mawrat
+		[363608] = NO_ITEM_ID, -- Divine Steed
+		[363701] = 188808, -- Patient Bufonid
+		[363703] = 188809, -- Prototype Leaper
+		[363706] = 188810, -- Russet Bufonid
+		[365559] = 189507, -- Cosmic Gladiator's Soul Eater
+		[366791] = 190170, -- Jigglesworth Sr.
+		[367190] = NO_ITEM_ID, -- JZB Test Mount
+		[367673] = 190580, -- Heartbond Lupine
+		[367676] = 190581, -- Nether-Gorged Greatwyrm
+		[368105] = 190765, -- Colossal Plaguespew Mawrat
+		[368128] = 190766, -- Colossal Wraithbound Mawrat
+		[368158] = 190768, -- Zereth Overseer
+		[368896] = 194034, -- Renewed Proto-Drake
+		[368899] = 194549, -- Windborne Velocidrake
+		[368901] = 194521, -- Cliffside Wylderdrake
+		[369666] = 191123, -- Grimhowl
+		[370346] = 191290, -- Eternal Gladiator's Soul Eater
+		[370620] = 191566, -- Elusive Emerald Hawkstrider
+		[370770] = NO_ITEM_ID, -- Tuskarr Shoreglider
+		[372995] = NO_ITEM_ID, -- Swift Spectral Drake
+		[373859] = 192601, -- Loyal Magmammoth
+		[374032] = 192761, -- Tamed Skitterfly
+		[374034] = 192762, -- Azure Skitterfly
+		[374048] = 192764, -- Verdant Skitterfly
+		[374098] = 192775, -- Stormhide Salamanther
+		[374138] = 192779, -- Scorchpath
+		[374155] = 192784, -- Shellack
+		[374162] = 192786, -- Scrappy Worldsnail
+		[374196] = 192791, -- Plainswalker Bearer
+		[374247] = 192799, -- Lizi, Thunderspine Tramper
+		[374263] = 192804, -- Restless Hornstrider
+		[374275] = 192806, -- Raging Magmammoth
+		[376873] = 198870, -- Otto
+		[376875] = 198872, -- Brown Scouting Ottuk
+		[376879] = 198873, -- Ivory Trader's Ottuk
+		[376880] = 200118, -- Yellow Scouting Ottuk
+		[376910] = 201426, -- Brown War Ottuk
+		[376912] = 198654, -- Otterworldly Ottuk Carrier
+		[376913] = 201425, -- Yellow War Ottuk
+		[377071] = 202086, -- Crimson Gladiator's Drake
+		[381529] = NO_ITEM_ID, -- Telix the Stormhorn
+		[384963] = 198808, -- Guardian Vorquin
+		[385115] = 198810, -- Majestic Armored Vorquin
+		[385131] = 198809, -- Armored Vorquin Leystrider
+		[385134] = 198811, -- Swift Armored Vorquin
+		[385266] = 198825, -- Zenet Hatchling
+		[385738] = 201454, -- Temperamental Skyclaw
+		[386452] = NO_ITEM_ID, -- Frostbrood Proto-Wyrm
+		[387231] = 199412, -- Hailstorm Armoredon
+		[387948] = NO_ITEM_ID, -- [PH] Wind Proto-Drake
+		[394216] = 201702, -- Crimson Vorquin
+		[394218] = 201704, -- Sapphire Vorquin
+		[394219] = 201720, -- Bronze Vorquin
+		[394220] = 201719, -- Obsidian Vorquin
+		[394737] = 201789, -- Vicious Sabertooth
+		[394738] = 201788, -- Vicious Sabertooth
+		[395644] = 198821, -- Divine Kiss of Ohn'ahra
+		[442358] = 221765, -- Stonevault Mechsuit
+		[451486] = 224147, -- Sureki Skyrazor
+		[451491] = 224151, -- Ascendant Skyrazor
 	},
 	["items"] = {
 		--[itemID] = spellID
-		[31830] = 39315,	-- Cobalt Riding Talbuk
-		[31832] = 39317,	-- Silver Riding Talbuk
-		[31834] = 39318,	-- Tan Riding Talbuk
-		[31836] = 39319,	-- White Riding Talbuk
-		[29227] = 34896,	-- Cobalt War Talbuk
-		[29229] = 34898,	-- Silver War Talbuk
-		[29230] = 34899,	-- Tan War Talbuk
-		[29231] = 34897,	-- White War Talbuk
-		[65356] = 88741,	-- Drake of the West Wind		double entry....
-		[91010] = 120822, 	-- Great Red Dragon Turtle
-		[142235] = 229486, 	-- Vicious War Bear
-		[143649] = 232525,	-- Vicious War Turtle
-		[143864] = 204166,	-- Reins of the Prestigious War Wolf
-		[128527] = 190977,	-- Deathtusk Felboar
-		[128481] = 190690,	-- Bristling Hellboar
-		[184014] = 327407, 	-- Vicious War Spider
-		[186179] = 348769, 	-- Vicious War Gorm
-		[187644] = 349824, 	-- Vicious Warstalker
-		[187681] = 347256, 	-- Vicious War Croaker
-		[194705] = 360954, 	-- ighland Drake
-		[201789] = 394737, 	-- Vicious Sabertooth
-	}, 
-	["index"] = {}, -- [spellID] = index
+		[31830] = 39315, -- Cobalt Riding Talbuk
+		[31832] = 39317, -- Silver Riding Talbuk
+		[31834] = 39318, -- Tan Riding Talbuk
+		[31836] = 39319, -- White Riding Talbuk
+		[29227] = 34896, -- Cobalt War Talbuk
+		[29229] = 34898, -- Silver War Talbuk
+		[29230] = 34899, -- Tan War Talbuk
+		[29231] = 34897, -- White War Talbuk
+		[65356] = 88741, -- Drake of the West Wind		double entry....
+		[91010] = 120822, -- Great Red Dragon Turtle
+		[142235] = 229486, -- Vicious War Bear
+		[143649] = 232525, -- Vicious War Turtle
+		[143864] = 204166, -- Reins of the Prestigious War Wolf
+		[128527] = 190977, -- Deathtusk Felboar
+		[128481] = 190690, -- Bristling Hellboar
+		[184014] = 327407, -- Vicious War Spider
+		[186179] = 348769, -- Vicious War Gorm
+		[187644] = 349824, -- Vicious Warstalker
+		[187681] = 347256, -- Vicious War Croaker
+		[194705] = 360954, -- Highland Drake
+		[201789] = 394737, -- Vicious Sabertooth
+		[226683] = 442358, -- Stonevault Mechsuit
+		[224147] = 451486, -- Sureki Skyrazor
+		[224151] = 451491, -- Ascendant Skyrazor
+	},
+	["index"] = {},  -- [spellID] = index
 }
 
 --[[
 local creatureName, spellID, icon, active, isUsable, sourceType = C_MountJournal.GetMountInfo(index);
 local creatureDisplayID, descriptionText, sourceText, isSelfMount, mountType = C_MountJournal.GetMountInfoExtra(index)
 MountJournal.MountDisplay.ModelFrame:SetDisplayInfo(creatureDisplayID)
-]]--
+]] --
 
 local function LoadAllData()
 	if ALL_DATA_LOADED then return end
-	
+
 	local _, spellID
 	local mountIDs = GetMountIDs()
-	for i=1,#mountIDs do
+	for i = 1, #mountIDs do
 		_, spellID = GetMountInfo(mountIDs[i])
 		if MOUNT_INFO["spells"][spellID] then
-			MOUNT_INFO["items"][ MOUNT_INFO["spells"][spellID] ] = spellID
+			MOUNT_INFO["items"][MOUNT_INFO["spells"][spellID]] = spellID
 		else
 			MOUNT_INFO["spells"][spellID] = NO_ITEM_ID
 		end
 		MOUNT_INFO["index"][spellID] = mountIDs[i]
 	end
-	
+
 	ALL_DATA_LOADED = true
 end
 
@@ -1193,12 +1199,12 @@ end
 
 function Mount.GetIndexFromItemID(itemID)
 	if not ALL_DATA_LOADED then LoadAllData() end
-	return ( MOUNT_INFO["items"][itemID] and MOUNT_INFO["items"][itemID] ~= 0 ) and MOUNT_INFO["index"][ MOUNT_INFO["items"][itemID] ] or nil
+	return (MOUNT_INFO["items"][itemID] and MOUNT_INFO["items"][itemID] ~= 0) and MOUNT_INFO["index"][MOUNT_INFO["items"][itemID]] or nil
 end
 
 function Mount.GetDisplayIDfromItemID(itemID)
-	local displayID = GetMountInfoExtra( Mount.GetIndexFromItemID(itemID) )
-	return ( displayID and displayID ~= 0 ) and displayID or nil
+	local displayID = GetMountInfoExtra(Mount.GetIndexFromItemID(itemID))
+	return (displayID and displayID ~= 0) and displayID or nil
 end
 
 --@do-not-package@
@@ -1207,20 +1213,19 @@ function Mount.DEV_SaveDataIntoDB()
 	AtlasLoot.db.MOUNTINFO = {}
 	AtlasLoot.db.MOUNTINFO_SPELL2ITEMID = {}
 	local numMounts = C_MountJournal.GetNumMounts()
-	
-	for i=1,numMounts do
+
+	for i = 1, numMounts do
 		local name, spellID, itemID
 		name, spellID = GetMountInfo(i)
 		if name and spellID then
 			AtlasLoot.db.MOUNTINFO[spellID] = name
-			
+
 			itemID = Mount.GetItemIDfromSpellID(spellID)
-			if (itemID and itemID ~=0) then
+			if (itemID and itemID ~= 0) then
 				AtlasLoot.db.MOUNTINFO_SPELL2ITEMID[spellID] = itemID
 			end
 		end
 	end
-	
-	
 end
+
 --@end-do-not-package@
diff --git a/AtlasLoot/GUI/GUI.lua b/AtlasLoot/GUI/GUI.lua
index 7a547906..60e9bf57 100644
--- a/AtlasLoot/GUI/GUI.lua
+++ b/AtlasLoot/GUI/GUI.lua
@@ -28,7 +28,7 @@ local function UpdateFrames(noPageUpdate)
 	local dataID = db.selected[2]
 	local bossID = db.selected[3]
 	local contentName, contentIndex, contentColor = moduleData[dataID]:GetContentType()
-	local name, description, bgImage, _, loreImage, dungeonAreaMapID 
+	local name, description, bgImage, _, loreImage, dungeonAreaMapID
 	contentColor = contentColor or ATLASLOOT_UNKNOWN_COLOR
 
 	if moduleData[dataID].EncounterJournalID and moduleData[dataID].items[bossID].EncounterJournalID then
@@ -38,25 +38,25 @@ local function UpdateFrames(noPageUpdate)
 		GUI.__EJData = nil
 		GUI.frame.contentFrame.clasFilterButton:Hide()
 	end
-	
+
 	-- Encounter Journal info
 	if moduleData[db.selected[2]].EncounterJournalID then
 		name, description, bgImage, _, loreImage, _, dungeonAreaMapID = EJ_GetInstanceInfo(moduleData[dataID].EncounterJournalID)
 	end
-	
+
 	-- Set Boss name
 	GUI.frame.contentFrame.title.txt = moduleData[dataID]:GetNameForItemTable(bossID)
 	GUI.frame.contentFrame.title:SetText(GUI.frame.contentFrame.title.txt)
-	
+
 	-- refresh background info
 	GUI.lastBgInfo = GUI.curBGInfo
 	GUI.curBgInfo = {
-		contentColor, 	-- color of topBg
-		moduleData[dataID].items[bossID].BgImage and moduleData[dataID].items[bossID].BgImage or (moduleData[dataID].BgImage and moduleData[dataID].BgImage or bgImage),	-- background image
+		contentColor,                                                                                                                                              -- color of topBg
+		moduleData[dataID].items[bossID].BgImage and moduleData[dataID].items[bossID].BgImage or (moduleData[dataID].BgImage and moduleData[dataID].BgImage or bgImage), -- background image
 	}
 
 	GUI.RefreshContentBackGround()
-	
+
 	-- set MapID
 	if not moduleData[dataID].MapID and dungeonAreaMapID and dungeonAreaMapID > 0 then
 		GUI.frame.contentFrame.mapButton.mapID = dungeonAreaMapID
@@ -84,7 +84,7 @@ local function UpdateFrames(noPageUpdate)
 		GUI.ModelFrame.EncounterJournalID = nil
 		GUI.frame.contentFrame.modelButton:Hide()
 	end
-	
+
 	-- SOUNDS
 	if moduleData[dataID].items[bossID].npcId then
 		GUI.SoundFrame.npcId = moduleData[dataID].items[bossID].npcId
@@ -99,7 +99,7 @@ local function UpdateFrames(noPageUpdate)
 			end
 		end
 	end
-	
+
 	-- AtlasMapID
 	if (AtlasLoot.AtlasIntegration.IsEnabled() and moduleData[dataID].AtlasMapID and AtlasLoot.AtlasIntegration.GetAtlasZoneData(moduleData[dataID].AtlasMapID)) then
 		GUI.frame.contentFrame.AtlasMapButton.AtlasMapID = moduleData[dataID].AtlasMapID
@@ -115,17 +115,17 @@ local function UpdateFrames(noPageUpdate)
 		GUI.frame.contentFrame.AtlasMapButton.AtlasMapID = nil
 		GUI.frame.contentFrame.AtlasMapButton:Hide()
 	end
-	
+
 	-- BaseLvl for Items
 	GUI.ItemFrame.ItemBaseLvl = moduleData[dataID].ItemBaseLvl
-		
+
 	if not noPageUpdate then
 		-- Next/Prev
-		if moduleData[dataID].items[bossID+1] then
-			if moduleData[dataID].items[bossID].ExtraList and moduleData[dataID].items[bossID+1].ExtraList then
+		if moduleData[dataID].items[bossID + 1] then
+			if moduleData[dataID].items[bossID].ExtraList and moduleData[dataID].items[bossID + 1].ExtraList then
 				GUI.frame.contentFrame.nextPageButton.info = nil
-				--GUI.frame.contentFrame.nextPageButton.info = bossID + 1	
-			elseif not moduleData[dataID].items[bossID+1].ExtraList and not moduleData[dataID].items[bossID].ExtraList then
+				--GUI.frame.contentFrame.nextPageButton.info = bossID + 1
+			elseif not moduleData[dataID].items[bossID + 1].ExtraList and not moduleData[dataID].items[bossID].ExtraList then
 				GUI.frame.contentFrame.nextPageButton.info = GUI.frame.boss:CheckIfNext()
 			else
 				GUI.frame.contentFrame.nextPageButton.info = nil
@@ -135,12 +135,12 @@ local function UpdateFrames(noPageUpdate)
 		end
 		if GUI.frame.contentFrame.shownFrame and GUI.frame.contentFrame.shownFrame.prevPage and not moduleData[dataID].items[bossID].ExtraList then
 			GUI.frame.contentFrame.prevPageButton.info = tostring(GUI.frame.contentFrame.shownFrame.prevPage)
-		elseif moduleData[dataID].items[bossID-1] and not moduleData[dataID].items[bossID].ExtraList then
+		elseif moduleData[dataID].items[bossID - 1] and not moduleData[dataID].items[bossID].ExtraList then
 			GUI.frame.contentFrame.prevPageButton.info = GUI.frame.boss:CheckIfPrev()
 		else
 			GUI.frame.contentFrame.prevPageButton.info = nil
-		end	
-		
+		end
+
 		-- refresh current page
 		if GUI.frame.contentFrame.shownFrame and GUI.frame.contentFrame.shownFrame.Refresh then
 			GUI.frame.contentFrame.shownFrame:Refresh()
@@ -148,7 +148,7 @@ local function UpdateFrames(noPageUpdate)
 			GUI.ItemFrame:Show()
 		end
 	end
-	
+
 	GUI:RefreshNextPrevButtons()
 end
 
@@ -160,7 +160,7 @@ local frameSave = {}
 function GUI.GetFrameByType(typ)
 	if not frameSave[typ] then frameSave[typ] = {} end
 	local frame = next(frameSave[typ])
-	if frame then 
+	if frame then
 		frameSave[typ][frame] = nil
 	end
 	return frame
@@ -184,7 +184,7 @@ end
 
 local function FrameOnDragStop(self)
 	self:StopMovingOrSizing()
-	local a,b,c,d,e = self:GetPoint()
+	local a, b, c, d, e = self:GetPoint()
 	db.point = { a, nil, c, d, e }
 end
 
@@ -215,14 +215,14 @@ end
 
 local function MapButtonOnClick(self)
 	if self.mapID then
-		WorldMapFrame.fromJournal = true	-- enable bossButtons
+		WorldMapFrame.fromJournal = true -- enable bossButtons
 		ShowUIPanel(WorldMapFrame)
 		OpenWorldMap(self.mapID)
 	end
 end
 
 local function MapButtonOnEnter(self, owner)
-	local tooltip = GetAlTooltip() 
+	local tooltip = GetAlTooltip()
 	tooltip:ClearLines()
 	if owner and type(owner) == "table" then
 		tooltip:SetOwner(owner[1], owner[2], owner[3], owner[4])
@@ -237,7 +237,7 @@ end
 local function AtlasMapButton_OnClick(self, button)
 	if (AtlasLoot.AtlasIntegration.IsEnabled()) then
 		if (button == "RightButton") then
-			if ( AtlasFrameSmall:IsVisible() ) then
+			if (AtlasFrameSmall:IsVisible()) then
 				HideUIPanel(AtlasFrameSmall)
 			end
 		else
@@ -249,7 +249,7 @@ local function AtlasMapButton_OnClick(self, button)
 end
 
 local function AtlasMapButton_OnEnter(self, owner)
-	local tooltip = GetAlTooltip() 
+	local tooltip = GetAlTooltip()
 	tooltip:ClearLines()
 	if owner and type(owner) == "table" then
 		tooltip:SetOwner(owner[1], owner[2], owner[3], owner[4])
@@ -265,9 +265,9 @@ local function ClassFilterButton_Refresh(self)
 	-- insert class selection?
 	self.texture:SetDesaturated(not db.classFilter)
 	if self.selectionFrame and self.selectionFrame:IsShown() then self.selectionFrame:Hide() end
-	
-	self.selectedPlayerSpecID = self.selectedPlayerSpecID or GetSpecialization() and ( GetLootSpecialization() == 0 and GetSpecializationInfo(GetSpecialization()) or GetLootSpecialization() ) or 0
-	
+
+	self.selectedPlayerSpecID = self.selectedPlayerSpecID or GetSpecialization() and (GetLootSpecialization() == 0 and GetSpecializationInfo(GetSpecialization()) or GetLootSpecialization()) or 0
+
 	if self.selectedPlayerSpecID == 0 then
 		self.specName = PLAYER_CLASS
 		self.specDesc = str_format(AL["Shows items for all %s specializations."], PLAYER_CLASS)
@@ -296,7 +296,7 @@ local function ClassFilterButton_OnEvent(self, event)
 end
 
 local function ClassFilterButton_OnEnter(self, owner)
-	local tooltip = GetAlTooltip() 
+	local tooltip = GetAlTooltip()
 	tooltip:ClearLines()
 	if owner and type(owner) == "table" then
 		tooltip:SetOwner(owner[1], owner[2], owner[3], owner[4])
@@ -339,20 +339,24 @@ local function ClassFilterButton_OnClick(self, button)
 		-- show spec selection here
 		if not self.selectionFrame then
 			local frame = CreateFrame("FRAME", nil, self, BackdropTemplateMixin and "BackdropTemplate" or nil)
-			frame:SetBackdrop({bgFile = "Interface/Tooltips/UI-Tooltip-Background",
-						edgeFile = "Interface/Tooltips/UI-Tooltip-Border", 
-						tile = true, tileSize = 16, edgeSize = 16, 
-						insets = { left = 4, right = 4, top = 4, bottom = 4 }})
-			frame:SetBackdropColor(0,0,0,1)
+			frame:SetBackdrop({
+				bgFile = "Interface/Tooltips/UI-Tooltip-Background",
+				edgeFile = "Interface/Tooltips/UI-Tooltip-Border",
+				tile = true,
+				tileSize = 16,
+				edgeSize = 16,
+				insets = { left = 4, right = 4, top = 4, bottom = 4 }
+			})
+			frame:SetBackdropColor(0, 0, 0, 1)
 			frame:SetPoint("BOTTOMLEFT", self, "TOP", 0, 5)
-			frame:SetSize(10,10)
+			frame:SetSize(10, 10)
 			frame.obj = self
 			frame.buttons = {}
-			
+
 			local width, newWidth, height = 10, 0, 10
 			local button_height = 20
-			local id, name, description, icon 
-			
+			local id, name, description, icon
+
 			local button = CreateFrame("BUTTON", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 			button:SetHighlightTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD")
 			button:SetPoint("TOPLEFT", frame, "TOPLEFT", 5, -5)
@@ -362,82 +366,82 @@ local function ClassFilterButton_OnClick(self, button)
 			button.specID = 0
 			button.specName = PLAYER_CLASS
 			button.specDesc = str_format(AL["Shows items for all %s specializations."], PLAYER_CLASS)
-			
-			button.icon = button:CreateTexture(nil, button)
+
+			button.icon = button:CreateTexture(nil, "ARTWORK")
 			button.icon:SetPoint("LEFT", button, "LEFT", 0, 0)
 			button.icon:SetSize(button_height, button_height)
 			button.icon:SetTexture("Interface\\Glues\\CharacterCreate\\UI-CharacterCreate-Classes")
 			button.icon:SetTexCoord(CLASS_ICON_TCOORDS[PLAYER_CLASS_FN][1], CLASS_ICON_TCOORDS[PLAYER_CLASS_FN][2], CLASS_ICON_TCOORDS[PLAYER_CLASS_FN][3], CLASS_ICON_TCOORDS[PLAYER_CLASS_FN][4])
-			
+
 			button.text = button:CreateFontString(nil, "ARTWORK", "GameFontNormal")
 			button.text:SetPoint("LEFT", button.icon, "RIGHT", 2, 0)
 			button.text:SetJustifyH("LEFT")
 			button.text:SetText(PLAYER_CLASS)
 			button.text:SetSize(button.text:GetStringWidth(), button_height)
-			
+
 			newWidth = button_height + 2 + button.text:GetWidth()
-			width = newWidth+10 > width and newWidth+10 or width
+			width = newWidth + 10 > width and newWidth + 10 or width
 			height = height + button_height + 1
-			
+
 			button:SetScript("OnClick", ClassFilterSpecButton_OnClick)
 			button:SetScript("OnEnter", ClassFilterButton_OnEnter)
 			button:SetScript("OnLeave", ClassFilterButton_OnLeave)
-			
+
 			frame.buttons[1] = button
-			
-			for i=1,GetNumSpecializations() do
+
+			for i = 1, GetNumSpecializations() do
 				id, name, description, icon = GetSpecializationInfo(i)
-				
+
 				button = CreateFrame("BUTTON", nil, frame)
 				button:SetHighlightTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD")
 				--button:SetAlpha(0.5)
 				--if i == 1 then
 				--	button:SetPoint("TOPLEFT", frame, "TOPLEFT", 5, -5)
 				--else
-					button:SetPoint("TOPLEFT", frame.buttons[#frame.buttons], "BOTTOMLEFT", 0, -1)
+				button:SetPoint("TOPLEFT", frame.buttons[#frame.buttons], "BOTTOMLEFT", 0, -1)
 				--end
 				button.obj = frame
 				button.specID = id
 				button.specName = name
 				button.specDesc = description
-				
-				button.icon = button:CreateTexture(nil, button)
+
+				button.icon = button:CreateTexture(nil, "ARTWORK")
 				button.icon:SetPoint("LEFT", button, "LEFT", 0, 0)
 				button.icon:SetSize(button_height, button_height)
 				button.icon:SetTexture(icon or "Interface\\Icons\\INV_Misc_QuestionMark")
-				
+
 				button.text = button:CreateFontString(nil, "ARTWORK", "GameFontNormal")
 				button.text:SetPoint("LEFT", button.icon, "RIGHT", 2, 0)
 				button.text:SetJustifyH("LEFT")
 				button.text:SetText(name)
 				button.text:SetSize(button.text:GetStringWidth(), button_height)
-				
+
 				newWidth = button_height + 2 + button.text:GetWidth()
-				width = newWidth+10 > width and newWidth+10 or width
+				width = newWidth + 10 > width and newWidth + 10 or width
 				--button:SetSize(newWidth, button_height)
 				height = height + button_height + 1
-				
+
 				button:SetScript("OnClick", ClassFilterSpecButton_OnClick)
 				button:SetScript("OnEnter", ClassFilterButton_OnEnter)
 				button:SetScript("OnLeave", ClassFilterButton_OnLeave)
-				
-				frame.buttons[i+1] = button
+
+				frame.buttons[i + 1] = button
 			end
 			for i = 1, #frame.buttons do
-				frame.buttons[i]:SetSize(width-10, button_height)
+				frame.buttons[i]:SetSize(width - 10, button_height)
 			end
-			
+
 			frame:SetSize(width, height)
 			frame:Hide()
-			
+
 			self.selectionFrame = frame
 		end
-			
-		if self.selectionFrame:IsShown() then 
-			self.selectionFrame:Hide() 
-		else 
+
+		if self.selectionFrame:IsShown() then
+			self.selectionFrame:Hide()
+		else
 			local button
-			for i = 1, #self.selectionFrame.buttons do 
+			for i = 1, #self.selectionFrame.buttons do
 				button = self.selectionFrame.buttons[i]
 				if button.specID == self.selectedPlayerSpecID then
 					button:SetAlpha(1.0)
@@ -445,7 +449,7 @@ local function ClassFilterButton_OnClick(self, button)
 					button:SetAlpha(0.5)
 				end
 			end
-			self.selectionFrame:Show() 
+			self.selectionFrame:Show()
 		end
 	end
 end
@@ -453,7 +457,7 @@ end
 -- Transmog
 local function TransmogButton_Refresh(self)
 	self.texture:SetDesaturated(not AtlasLoot.db.GUI.transMogHighlighter)
-	
+
 	if GUI.frame.contentFrame.shownFrame and GUI.frame.contentFrame.shownFrame.OnTransMogUpdate then
 		GUI.frame.contentFrame.shownFrame.OnTransMogUpdate()
 	end
@@ -465,14 +469,14 @@ local function TransmogButton_OnClick(self, button)
 end
 
 local function TransmogButton_OnEnter(self, owner)
-	local tooltip = GetAlTooltip() 
+	local tooltip = GetAlTooltip()
 	tooltip:ClearLines()
 	if owner and type(owner) == "table" then
 		tooltip:SetOwner(owner[1], owner[2], owner[3], owner[4])
 	else
 		tooltip:SetOwner(self, "ANCHOR_RIGHT", -(self:GetWidth() * 0.5), 5)
 	end
-	tooltip:AddLine(TRANSMOGRIFY )
+	tooltip:AddLine(TRANSMOGRIFY)
 	tooltip:Show()
 end
 
@@ -483,7 +487,7 @@ end
 
 local function NextPrevButtonOnClick(self)
 	if self.info then
-		if type(self.info) == "string" then 	-- next item page
+		if type(self.info) == "string" then -- next item page
 			AtlasLoot.db.GUI.selected[5] = tonumber(self.info)
 			UpdateFrames()
 		elseif type(self.info) == "table" then
@@ -491,7 +495,7 @@ local function NextPrevButtonOnClick(self)
 			GUI.frame.boss:SetSelected(self.info[1])
 		elseif type(self.info) == "number" then
 			GUI.frame.boss:SetSelected(self.info)
-		else	-- next boss ;)
+		else -- next boss ;)
 			if self.typ == "next" then
 				GUI.frame.boss:SetNext()
 			else
@@ -529,26 +533,26 @@ local function loadModule(addonName)
 		if not first then first = content end
 		if content == db.selected[2] then foundDbValue = true end
 		contentName, contentIndex, contentColor = moduleData[content]:GetContentType()
-		data[contentIndex][ #data[contentIndex]+1 ] = {
-			id			= content,
-			name		= moduleData[content]:GetName(),
-			tt_title	= moduleData[content]:GetName(),
-			tt_text		= moduleData[content]:GetInfo(),
+		data[contentIndex][#data[contentIndex] + 1] = {
+			id       = content,
+			name     = moduleData[content]:GetName(),
+			tt_title = moduleData[content]:GetName(),
+			tt_text  = moduleData[content]:GetInfo(),
 		}
 	end
 	if data[0] and #data[0] > 0 then
-		data[#data+1] = data[0]
+		data[#data + 1] = data[0]
 		data[0] = nil
 	end
 	if not foundDbValue then
 		db.selected[2] = first
 	end
-	
+
 	GUI.frame.subCatSelect:SetData(data, db.selected[2])
 	if GUI.frame.contentFrame.loadingDataText and GUI.frame.contentFrame.loadingDataText:IsShown() then
 		GUI.frame.contentFrame.loadingDataText:Hide()
 	end
-	
+
 	if not GUI.frame.contentFrame.itemsButton:IsShown() then
 		GUI.frame.contentFrame.itemsButton:Show()
 	end
@@ -560,7 +564,7 @@ function GUI:ShowLoadingInfo(addonName, noWipe, displayType)
 		text:SetAllPoints(GUI.frame.contentFrame)
 		text:SetJustifyH("CENTER")
 		text:SetJustifyV("MIDDLE")
-		text:SetTextColor(1,1,1)
+		text:SetTextColor(1, 1, 1)
 		GUI.frame.contentFrame.loadingDataText = text
 	end
 	if GUI.frame.contentFrame.shownFrame and GUI.frame.contentFrame.shownFrame.Clear then
@@ -580,7 +584,7 @@ function GUI:ShowLoadingInfo(addonName, noWipe, displayType)
 		GUI:RefreshNextPrevButtons()
 		GUI.frame.contentFrame.clasFilterButton:Hide()
 	end
-	
+
 	if not displayType or displayType == "InCombat" then
 		GUI.frame.contentFrame.loadingDataText:SetText(str_format(AL["%s will finish loading after combat."], addonName))
 	elseif displayType == "DISABLED" then
@@ -590,7 +594,7 @@ function GUI:ShowLoadingInfo(addonName, noWipe, displayType)
 	else
 		GUI.frame.contentFrame.loadingDataText:SetText(addonName)
 	end
-	
+
 	GUI.frame.contentFrame.loadingDataText:Show()
 end
 
@@ -615,14 +619,14 @@ local function SubCatSelectFunction(self, id, arg)
 	local moduleData = AtlasLoot.ItemDB:Get(db.selected[1])
 	local data = {}
 	local dataExtra
-	
+
 	local tabVal
 	for i = 1, #moduleData[id].items do
 		tabVal = moduleData[id].items[i]
 		moduleData:CheckForLink(id, i)
 		if tabVal.ExtraList then
 			if not dataExtra then dataExtra = {} end
-			dataExtra[#dataExtra+1] = {
+			dataExtra[#dataExtra + 1] = {
 				id = i,
 				name = moduleData[id]:GetNameForItemTable(i),
 				coinTexture = tabVal.CoinTexture,
@@ -631,7 +635,7 @@ local function SubCatSelectFunction(self, id, arg)
 			}
 			if not dataExtra[#dataExtra].name then dataExtra[#dataExtra] = nil end
 		else
-			data[#data+1] = {
+			data[#data + 1] = {
 				id = i,
 				name = moduleData[id]:GetNameForItemTable(i),
 				coinTexture = tabVal.CoinTexture,
@@ -643,13 +647,12 @@ local function SubCatSelectFunction(self, id, arg)
 	end
 	-- change difficulty from some instances
 	-- this prevents load from unused modules
-	db.selected[4] = moduleData[id].LoadDifficulty or db.selected[4] 
+	db.selected[4] = moduleData[id].LoadDifficulty or db.selected[4]
 	--if dataExtra then
-		GUI.frame.extra:SetData(dataExtra)
+	GUI.frame.extra:SetData(dataExtra)
 	--end
 	db.selected[3] = data[1] and data[1].id or 1
 	GUI.frame.boss:SetData(data, db.selected[3])
-	
 end
 
 local function BossSelectFunction(self, id, arg)
@@ -662,7 +665,7 @@ local function BossSelectFunction(self, id, arg)
 	local data = {}
 	for count = 1, #difficultys do
 		if moduleData[db.selected[2]].items[id][count] then
-			data[ #data+1 ] = {
+			data[#data + 1] = {
 				id = count,
 				name = difficultys[count].name,
 				tt_title = difficultys[count].name
@@ -683,14 +686,14 @@ local function ExtraSelectFunction(self, id, arg)
 	local data = {}
 	for count = 1, #difficultys do
 		if moduleData[db.selected[2]].items[id][count] then
-			data[ #data+1 ] = {
+			data[#data + 1] = {
 				id = count,
 				name = difficultys[count].name,
 				tt_title = difficultys[count].name
 			}
 		end
 	end
-	
+
 	GUI.frame.difficulty:SetData(data, moduleData:GetDifficulty(db.selected[2], db.selected[3], db.selected[4]))
 	--UpdateFrames()
 end
@@ -707,15 +710,15 @@ end
 -- ################################
 function GUI.Init()
 	db = AtlasLoot.db.GUI
-	
+
 	GUI:Create()
-	
+
 	-- Class Info
 	PLAYER_CLASS, PLAYER_CLASS_FN = UnitClass("player")
-	
+
 	-- create module list
-	local data = {} 
-	
+	local data = {}
+
 	local tmp = AtlasLoot.Loader:GetLootModuleList()
 	local index = 0
 	local first, foundDbValue
@@ -725,18 +728,18 @@ function GUI.Init()
 		data[index] = {
 			info = {
 				name = AL["AtlasLoot Modules"],
-				bgColor = {0, 0, 0, 1},		-- Background color
+				bgColor = { 0, 0, 0, 1 }, -- Background color
 			}
 		}
 		for i = 1, #tmp.module do
 			v = tmp.module[i]
 			if not first then first = v.addonName end
 			if v.addonName == db.selected[1] then foundDbValue = true end
-			data[index][ #data[index]+1 ] = {
-				id			= v.addonName,
-				name		= v.name,
-				tt_title	= v.tt_title,
-				tt_text		= v.tt_text,
+			data[index][#data[index] + 1] = {
+				id       = v.addonName,
+				name     = v.name,
+				tt_title = v.tt_title,
+				tt_text  = v.tt_text,
 			}
 		end
 	end
@@ -745,18 +748,18 @@ function GUI.Init()
 		data[index] = {
 			info = {
 				name = AL["Custom Modules"],
-				bgColor = {0, 0.3, 0, 1},		-- Background color
+				bgColor = { 0, 0.3, 0, 1 }, -- Background color
 			}
 		}
 		for i = 1, #tmp.custom do
 			v = tmp.custom[i]
 			if not first then first = v.addonName end
 			if v.addonName == db.selected[1] then foundDbValue = true end
-			data[index][ #data[index]+1 ] = {
-				id			= v.addonName,
-				name		= v.name,
-				tt_title	= v.tt_title,
-				tt_text		= v.tt_text,
+			data[index][#data[index] + 1] = {
+				id       = v.addonName,
+				name     = v.name,
+				tt_title = v.tt_title,
+				tt_text  = v.tt_text,
 			}
 		end
 	end
@@ -768,7 +771,7 @@ function GUI.Init()
 	else
 		GUI.frame.moduleSelect:SetData(data)
 	end
-	
+
 	AtlasLoot.SlashCommands:AddResetFunction(GUI.ResetFrames, "frames", "gui")
 	AtlasLoot.SlashCommands:Add("togglebg", function() db.hideBGImage = not db.hideBGImage end, AL["/al togglebg - Toggle the background image on loottables."])
 
@@ -777,6 +780,7 @@ function GUI.Init()
 		AtlasLoot:PreLoadModules();
 	end
 end
+
 AtlasLoot:AddInitFunc(GUI.Init)
 
 function GUI:Toggle()
@@ -810,7 +814,7 @@ function GUI:Create()
 	if GUI_CREATED then return end
 	GUI_CREATED = true
 	local frameName = "AtlasLoot_GUI-Frame"
-	
+
 	local frame = CreateFrame("Frame", frameName, nil, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	frame:ClearAllPoints()
 	frame:SetParent(UIParent)
@@ -829,86 +833,86 @@ function GUI:Create()
 	frame:SetBackdrop(ALPrivate.BOX_BACKDROP)
 	--frame:SetBackdropColor(0.45,0.45,0.45,1)
 	frame:Hide()
-	tinsert(UISpecialFrames, frameName)	-- allow ESC close
-	
+	tinsert(UISpecialFrames, frameName) -- allow ESC close
+
 	frame.CloseButton = CreateFrame("Button", frameName.."-CloseButton", frame, "UIPanelCloseButton")
 	frame.CloseButton:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, 0)
-	
+
 	--frame.Title = frame:CreateFontString(nil, "ARTWORK", "GameFontNormal")
 	--frame.Title:SetPoint("TOP", frame, "TOP", 0, -10)
 	--frame.Title:SetText(AL["AtlasLoot"])
-	
+
 	frame.titleFrame = AtlasLoot.GUI.CreateTextWithBg(frame, 0, 0)
 	frame.titleFrame:SetPoint("TOPLEFT", frame, 10, -7)
 	frame.titleFrame:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -30, -25)
 	frame.titleFrame.text:SetText(AL["AtlasLoot"])
-	
+
 	frame.moduleSelect = GUI:CreateDropDown()
 	frame.moduleSelect:SetParPoint("TOPLEFT", frame, "TOPLEFT", 10, -40)
 	frame.moduleSelect:SetWidth(270)
 	frame.moduleSelect:SetTitle(AL["Select Module"])
 	frame.moduleSelect:SetText("Select Module")
 	frame.moduleSelect:SetButtonOnClick(ModuleSelectFunction)
-	
+
 	frame.subCatSelect = GUI:CreateDropDown()
 	frame.subCatSelect:SetParPoint("TOPLEFT", frame.moduleSelect.frame, "TOPRIGHT", 20, 0)
 	frame.subCatSelect:SetWidth(270)
 	frame.subCatSelect:SetTitle(AL["Select Subcategory"])
 	frame.subCatSelect:SetText("Select Subcategory")
 	frame.subCatSelect:SetButtonOnClick(SubCatSelectFunction)
-	
+
 	frame.difficulty = GUI:CreateSelect()
 	frame.difficulty:SetParPoint("TOPRIGHT", frame, "TOPRIGHT", -10, -40)
 	frame.difficulty:SetWidth(320)
 	frame.difficulty:SetNumEntrys(4)
 	frame.difficulty:ShowSelectedCoin(true)
 	frame.difficulty:SetButtonOnClick(DifficultySelectFunction)
-	
+
 	frame.boss = GUI:CreateSelect()
 	frame.boss:SetParPoint("TOPLEFT", frame.difficulty.frame, "BOTTOMLEFT", 0, -10)
 	frame.boss:SetWidth(320)
 	frame.boss:SetNumEntrys(20)
 	frame.boss:SetButtonOnClick(BossSelectFunction)
-	
+
 	frame.extra = GUI:CreateSelect()
 	frame.extra:SetParPoint("TOPLEFT", frame.boss.frame, "BOTTOMLEFT", 0, -10)
 	frame.extra:SetWidth(320)
 	frame.extra:SetNumEntrys(5)
 	frame.extra:SetButtonOnClick(ExtraSelectFunction)
-	
-	frameName =  "AtlasLoot_GUI-ItemFrame"
-	
+
+	frameName = "AtlasLoot_GUI-ItemFrame"
+
 	frame.contentFrame = CreateFrame("Frame", frameName)
 	frame.contentFrame:ClearAllPoints()
 	frame.contentFrame:SetParent(frame)
 	frame.contentFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 10, -70)
-	frame.contentFrame:SetWidth(560)		-- Frame = 560, Abstand = 20, Button = 270
-	frame.contentFrame:SetHeight(510)		-- Frame = 460, Abstand = 10, Button = 30
+	frame.contentFrame:SetWidth(560) -- Frame = 560, Abstand = 20, Button = 270
+	frame.contentFrame:SetHeight(510) -- Frame = 460, Abstand = 10, Button = 30
 	frame.contentFrame.shownFrame = nil
-	
+
 	frame.contentFrame.title = frame.contentFrame:CreateFontString(frameName.."-title", "ARTWORK", "GameFontHighlightLarge")
 	frame.contentFrame.title:SetPoint("TOP", frame.contentFrame, "TOP")
 	frame.contentFrame.title:SetJustifyH("CENTER")
 	frame.contentFrame.title:SetText("")
 	frame.contentFrame.title:SetWidth(frame.contentFrame:GetWidth())
 	frame.contentFrame.title:SetHeight(30)
-	
-	frame.contentFrame.topBG = frame.contentFrame:CreateTexture(frameName.."-topBG","BACKGROUND")
+
+	frame.contentFrame.topBG = frame.contentFrame:CreateTexture(frameName.."-topBG", "BACKGROUND")
 	frame.contentFrame.topBG:SetPoint("TOPLEFT", frame.contentFrame, "TOPLEFT")
 	frame.contentFrame.topBG:SetWidth(560)
 	frame.contentFrame.topBG:SetHeight(30)
-	
-	frame.contentFrame.downBG = frame.contentFrame:CreateTexture(frameName.."-downBG","BACKGROUND")
+
+	frame.contentFrame.downBG = frame.contentFrame:CreateTexture(frameName.."-downBG", "BACKGROUND")
 	frame.contentFrame.downBG:SetPoint("TOPLEFT", frame.contentFrame, "TOPLEFT", 0, -480)
 	frame.contentFrame.downBG:SetWidth(560)
 	frame.contentFrame.downBG:SetHeight(30)
-	
-	frame.contentFrame.itemBG = frame.contentFrame:CreateTexture(frameName.."-itemBG","BACKGROUND")
+
+	frame.contentFrame.itemBG = frame.contentFrame:CreateTexture(frameName.."-itemBG", "BACKGROUND")
 	frame.contentFrame.itemBG:SetPoint("TOPLEFT", frame.contentFrame, "TOPLEFT", 0, -30)
 	frame.contentFrame.itemBG:SetWidth(560)
 	frame.contentFrame.itemBG:SetHeight(450)
 	frame.contentFrame.itemBG:SetTexCoord(0.1, 0.7, 0.1, 0.7)
-	
+
 	-- #####
 	-- Right -> Left
 	-- #####
@@ -923,7 +927,7 @@ function GUI:Create()
 	frame.contentFrame.nextPageButton:SetPoint("RIGHT", frame.contentFrame.downBG, "RIGHT", 0, 0)
 	frame.contentFrame.nextPageButton:SetScript("OnClick", NextPrevButtonOnClick)
 	frame.contentFrame.nextPageButton.typ = "next"
-	
+
 	-- mapButton
 	frame.contentFrame.mapButton = CreateFrame("Button", frameName.."-mapButton")
 	frame.contentFrame.mapButton:SetParent(frame.contentFrame)
@@ -936,28 +940,28 @@ function GUI:Create()
 	frame.contentFrame.mapButton:SetScript("OnEnter", MapButtonOnEnter)
 	frame.contentFrame.mapButton:SetScript("OnLeave", function(self) GetAlTooltip():Hide() end)
 	frame.contentFrame.mapButton:Hide()
-	
-	frame.contentFrame.mapButton.texture = frame.contentFrame.mapButton:CreateTexture(frameName.."-mapButton-texture","ARTWORK")
+
+	frame.contentFrame.mapButton.texture = frame.contentFrame.mapButton:CreateTexture(frameName.."-mapButton-texture", "ARTWORK")
 	frame.contentFrame.mapButton.texture:SetPoint("RIGHT", frame.contentFrame.mapButton)
 	frame.contentFrame.mapButton.texture:SetWidth(48)
 	frame.contentFrame.mapButton.texture:SetHeight(32)
 	frame.contentFrame.mapButton.texture:SetTexture("Interface\\QuestFrame\\UI-QuestMap_Button")
-	frame.contentFrame.mapButton.texture:SetTexCoord(0.125, 0.875, 0.0, 0.5)	
-	
-	frame.contentFrame.mapButton.highlight = frame.contentFrame.mapButton:CreateTexture(frameName.."-mapButton-highlight","HIGHLIGHT")
+	frame.contentFrame.mapButton.texture:SetTexCoord(0.125, 0.875, 0.0, 0.5)
+
+	frame.contentFrame.mapButton.highlight = frame.contentFrame.mapButton:CreateTexture(frameName.."-mapButton-highlight", "HIGHLIGHT")
 	frame.contentFrame.mapButton.highlight:SetPoint("RIGHT", frame.contentFrame.mapButton, -7, 0)
 	frame.contentFrame.mapButton.highlight:SetWidth(36)
 	frame.contentFrame.mapButton.highlight:SetHeight(25)
 	frame.contentFrame.mapButton.highlight:SetTexture("Interface\\BUTTONS\\ButtonHilight-Square")
-	frame.contentFrame.mapButton.highlight:SetBlendMode("ADD")	
-	
+	frame.contentFrame.mapButton.highlight:SetBlendMode("ADD")
+
 	-- Model
 	frame.contentFrame.modelButton = GUI.CreateButton()
 	frame.contentFrame.modelButton:SetPoint("RIGHT", frame.contentFrame.mapButton, "LEFT", -2, 0)
 	frame.contentFrame.modelButton:SetText(AL["Model"])
 	frame.contentFrame.modelButton:SetScript("OnClick", ModelButtonOnClick)
 	frame.contentFrame.modelButton:Hide()
-	
+
 	-- AtlasMapButton
 	frame.contentFrame.AtlasMapButton = CreateFrame("Button", frameName.."-AtlasMapButton")
 	frame.contentFrame.AtlasMapButton:SetParent(frame.contentFrame)
@@ -968,27 +972,27 @@ function GUI:Create()
 	frame.contentFrame.AtlasMapButton:SetScript("OnClick", AtlasMapButton_OnClick)
 	frame.contentFrame.AtlasMapButton:SetScript("OnEnter", AtlasMapButton_OnEnter)
 	frame.contentFrame.AtlasMapButton:SetScript("OnLeave", function(self) GetAlTooltip():Hide() end)
-	
-	frame.contentFrame.AtlasMapButton.texture = frame.contentFrame.AtlasMapButton:CreateTexture(frameName.."-AtlasMapButton-texture","ARTWORK")
+
+	frame.contentFrame.AtlasMapButton.texture = frame.contentFrame.AtlasMapButton:CreateTexture(frameName.."-AtlasMapButton-texture", "ARTWORK")
 	frame.contentFrame.AtlasMapButton.texture:SetPoint("RIGHT", frame.contentFrame.AtlasMapButton)
 	frame.contentFrame.AtlasMapButton.texture:SetWidth(32)
 	frame.contentFrame.AtlasMapButton.texture:SetHeight(32)
 	frame.contentFrame.AtlasMapButton.texture:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\Atlas_Button")
-	
-	frame.contentFrame.AtlasMapButton.highlight = frame.contentFrame.AtlasMapButton:CreateTexture(frameName.."-AtlasMapButton-highlight","HIGHLIGHT")
+
+	frame.contentFrame.AtlasMapButton.highlight = frame.contentFrame.AtlasMapButton:CreateTexture(frameName.."-AtlasMapButton-highlight", "HIGHLIGHT")
 	frame.contentFrame.AtlasMapButton.highlight:SetPoint("CENTER", frame.contentFrame.AtlasMapButton, 0, 0)
 	frame.contentFrame.AtlasMapButton.highlight:SetWidth(48)
 	frame.contentFrame.AtlasMapButton.highlight:SetHeight(48)
 	frame.contentFrame.AtlasMapButton.highlight:SetTexture("Interface\\Buttons\\UI-Common-MouseHilight")
-	frame.contentFrame.AtlasMapButton.highlight:SetBlendMode("ADD")	
+	frame.contentFrame.AtlasMapButton.highlight:SetBlendMode("ADD")
 
 	-- Sound
 	frame.contentFrame.soundsButton = GUI.CreateButton()
 	frame.contentFrame.soundsButton:SetPoint("RIGHT", frame.contentFrame.modelButton, "LEFT", -5, 0)
 	frame.contentFrame.soundsButton:SetText(AL["Sounds"])
 	frame.contentFrame.soundsButton:SetScript("OnClick", SoundButtonOnClick)
-		
-	
+
+
 	-- #####
 	-- Left -> Right
 	-- #####
@@ -1003,12 +1007,12 @@ function GUI:Create()
 	frame.contentFrame.prevPageButton:SetPoint("LEFT", frame.contentFrame.downBG, "LEFT", 5, 0)
 	frame.contentFrame.prevPageButton:SetScript("OnClick", NextPrevButtonOnClick)
 	frame.contentFrame.prevPageButton.typ = "prev"
-	
+
 	frame.contentFrame.itemsButton = GUI.CreateButton()
 	frame.contentFrame.itemsButton:SetPoint("LEFT", frame.contentFrame.prevPageButton, "RIGHT", 5, 0)
 	frame.contentFrame.itemsButton:SetText(AL["Items"])
 	frame.contentFrame.itemsButton:SetScript("OnClick", ItemButtonOnClick)
-	
+
 	-- Class Filter
 	frame.contentFrame.clasFilterButton = CreateFrame("Button", frameName.."-clasFilterButton")
 	frame.contentFrame.clasFilterButton:SetParent(frame.contentFrame)
@@ -1024,11 +1028,11 @@ function GUI:Create()
 	frame.contentFrame.clasFilterButton:SetScript("OnLeave", ClassFilterButton_OnLeave)
 	frame.contentFrame.clasFilterButton.mainButton = true
 	frame.contentFrame.clasFilterButton:Hide()
-	
-	frame.contentFrame.clasFilterButton.texture = frame.contentFrame.clasFilterButton:CreateTexture(frameName.."-clasFilterButton-texture","ARTWORK")
+
+	frame.contentFrame.clasFilterButton.texture = frame.contentFrame.clasFilterButton:CreateTexture(frameName.."-clasFilterButton-texture", "ARTWORK")
 	frame.contentFrame.clasFilterButton.texture:SetAllPoints(frame.contentFrame.clasFilterButton)
 	frame.contentFrame.clasFilterButton.texture:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
-	
+
 	-- Transmog
 	frame.contentFrame.transmogButton = CreateFrame("Button", frameName.."-transmofButton")
 	frame.contentFrame.transmogButton:SetParent(frame.contentFrame)
@@ -1043,28 +1047,27 @@ function GUI:Create()
 	frame.contentFrame.transmogButton:SetScript("OnEnter", TransmogButton_OnEnter)
 	frame.contentFrame.transmogButton:SetScript("OnLeave", TransmogButton_OnLeave)
 	--frame.contentFrame.transmogButton:Hide()
-	
-	frame.contentFrame.transmogButton.texture = frame.contentFrame.transmogButton:CreateTexture(frameName.."-transmogButton-texture","ARTWORK")
+
+	frame.contentFrame.transmogButton.texture = frame.contentFrame.transmogButton:CreateTexture(frameName.."-transmogButton-texture", "ARTWORK")
 	frame.contentFrame.transmogButton.texture:SetAllPoints(frame.contentFrame.transmogButton)
 	frame.contentFrame.transmogButton.texture:SetTexture("Interface\\Icons\\INV_Arcane_Orb")
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
 	self.frame = frame
-	
+
 	GUI.RefreshMainFrame()
-	
+
 	self.ItemFrame:Create()
 	--self.SoundFrame:Create()
 end
 
 function GUI.RefreshStyle()
-	
-end
 
+end
 
 function GUI.ResetFrames()
 	db.point = { "CENTER" }
@@ -1081,11 +1084,11 @@ function GUI.Temp_SetParPoint(self, ...)
 	-- check for Parent
 	local tmp
 	local parent = frame:GetParent()
-	for i=1, select('#', ...) do
-		tmp = select(i,...)
+	for i = 1, select('#', ...) do
+		tmp = select(i, ...)
 		if type(tmp) == "string" then
 			if _G[tmp] and _G[tmp].GetObjectType then
-				parent = _G[tmp] 
+				parent = _G[tmp]
 				break
 			end
 		elseif type(tmp) == "table" and tmp.GetObjectType then
@@ -1093,7 +1096,7 @@ function GUI.Temp_SetParPoint(self, ...)
 			break
 		end
 	end
-	
+
 	frame:SetParent(parent:GetObjectType() == "Frame" and parent or parent:GetParent())
 	-- check if we have a overridden SetPoint
 	if frame.SetPoint == GUI.Temp_SetParPoint then
@@ -1115,7 +1118,7 @@ function GUI.RefreshContentBackGround()
 	local frame = GUI.frame.contentFrame
 
 	-- top Bg
-	if db.contentTopBar.useContentColor and ( frame.topBG.curAlpha ~= db.contentTopBar.bgColor[4] or frame.topBG.curColor ~= GUI.curBgInfo[1]) then
+	if db.contentTopBar.useContentColor and (frame.topBG.curAlpha ~= db.contentTopBar.bgColor[4] or frame.topBG.curColor ~= GUI.curBgInfo[1]) then
 		frame.topBG:SetColorTexture(GUI.curBgInfo[1][1], GUI.curBgInfo[1][2], GUI.curBgInfo[1][3], db.contentTopBar.bgColor[4])
 		frame.topBG.curColor = GUI.curBgInfo[1]
 		frame.topBG.curAlpha = db.contentTopBar.bgColor[4]
@@ -1123,18 +1126,18 @@ function GUI.RefreshContentBackGround()
 		frame.topBG:SetColorTexture(db.contentTopBar.bgColor[1], db.contentTopBar.bgColor[2], db.contentTopBar.bgColor[3], db.contentTopBar.bgColor[4])
 		frame.topBG.curColor = db.contentTopBar.bgColor
 	end
-	
+
 	-- content Bg
-	if db.content.showBgImage and GUI.curBgInfo and GUI.curBgInfo[2] ~= ( GUI.lastBgInfo and GUI.lastBgInfo[2] or nil) then
+	if db.content.showBgImage and GUI.curBgInfo and GUI.curBgInfo[2] ~= (GUI.lastBgInfo and GUI.lastBgInfo[2] or nil) then
 		GUI.frame.contentFrame.itemBG:SetTexture(GUI.curBgInfo[2])
 		GUI.frame.contentFrame.itemBG:SetAlpha(db.content.bgColor[4])
 	elseif not db.content.showBgImage or not GUI.curBgInfo[2] then
 		GUI.frame.contentFrame.itemBG:SetAlpha(1)
 		GUI.frame.contentFrame.itemBG:SetColorTexture(db.content.bgColor[1], db.content.bgColor[2], db.content.bgColor[3], db.content.bgColor[4])
 	end
-	
+
 	-- bottom Bg
-	if db.contentBottomBar.useContentColor and ( frame.downBG.curAlpha ~= db.contentBottomBar.bgColor[4] or frame.downBG.curColor ~= GUI.curBgInfo[1]) then
+	if db.contentBottomBar.useContentColor and (frame.downBG.curAlpha ~= db.contentBottomBar.bgColor[4] or frame.downBG.curColor ~= GUI.curBgInfo[1]) then
 		frame.downBG:SetColorTexture(GUI.curBgInfo[1][1], GUI.curBgInfo[1][2], GUI.curBgInfo[1][3], db.contentBottomBar.bgColor[4])
 		frame.downBG.curColor = GUI.curBgInfo[1]
 		frame.downBG.curAlpha = db.contentBottomBar.bgColor[4]
@@ -1146,21 +1149,21 @@ end
 
 function GUI.RefreshMainFrame()
 	if not GUI.frame then return end
-	
+
 	local frame = GUI.frame
 	frame:SetBackdropColor(db.mainFrame.bgColor[1], db.mainFrame.bgColor[2], db.mainFrame.bgColor[3], db.mainFrame.bgColor[4])
 	frame.titleFrame:SetBackdropColor(db.mainFrame.title.bgColor[1], db.mainFrame.title.bgColor[2], db.mainFrame.title.bgColor[3], db.mainFrame.title.bgColor[4])
 	frame.titleFrame.text:SetTextColor(db.mainFrame.title.textColor[1], db.mainFrame.title.textColor[2], db.mainFrame.title.textColor[3], db.mainFrame.title.textColor[4])
 	frame.titleFrame.text:SetFont(LibSharedMedia:Fetch("font", db.mainFrame.title.font), db.mainFrame.title.size)
-	
+
 	frame:SetScale(db.mainFrame.scale)
 end
 
 function GUI.RefreshFonts()
 	if not GUI.frame then return end
 	local frame = GUI.frame.contentFrame
-	
-	
+
+
 	frame.title:SetFont(LibSharedMedia:Fetch("font", db.contentTopBar.font.font), db.contentTopBar.font.size)
 	frame.title:SetTextColor(db.contentTopBar.font.color[1], db.contentTopBar.font.color[2], db.contentTopBar.font.color[3], db.contentTopBar.font.color[4])
 end
diff --git a/AtlasLoot_TheWarWithin/AtlasLoot_TheWarWithin.toc b/AtlasLoot_TheWarWithin/AtlasLoot_TheWarWithin.toc
new file mode 100644
index 00000000..64263a74
--- /dev/null
+++ b/AtlasLoot_TheWarWithin/AtlasLoot_TheWarWithin.toc
@@ -0,0 +1,17 @@
+## Interface: 110007
+
+## Title: AtlasLoot |cFF0099FF[The War Within]|r
+
+## Notes: AtlasLoot loot tables from The War Within
+
+## Author: nanderson11
+## Version: @project-version@
+## IconTexture: Interface\Icons\INV_Box_01
+## Dependencies: AtlasLoot
+## LoadOnDemand: 1
+## X-Category: Map
+## X-License: GPL v2
+## X-Website: https://github.com/nanderson11/AtlasLootEnhanced
+## X-AtlasLoot-LootModule: 1
+
+data.lua
diff --git a/AtlasLoot_TheWarWithin/data.lua b/AtlasLoot_TheWarWithin/data.lua
new file mode 100644
index 00000000..aa22aea9
--- /dev/null
+++ b/AtlasLoot_TheWarWithin/data.lua
@@ -0,0 +1,943 @@
+-----------------------------------------------------------------------
+-- Upvalued Lua API.
+-----------------------------------------------------------------------
+local _G = getfenv(0)
+
+-- ----------------------------------------------------------------------------
+-- AddOn namespace.
+-- ----------------------------------------------------------------------------
+local addonname = ...
+local AtlasLoot = _G.AtlasLoot
+local data = AtlasLoot.ItemDB:Add(addonname, 11)
+
+AtlasLoot:RegisterModules(addonname)
+
+local AL = AtlasLoot.Locales
+
+local RF_DIFF = data:AddDifficulty(AL["Raid Finder"], "LFRWithPreset", {
+	Item = {
+		item2bonus = "BfAMaxItemLvl",
+		autoCompleteItem2 = true,
+		addDifficultyBonus = true,
+	},
+}, 17)
+local NORMAL_DIFF = data:AddDifficulty(AL["Normal"], "n", {
+	Item = {
+		item1bonus = "Scaling",
+		addDifficultyBonus = true,
+	},
+}, 1)
+local NORMAL_RAID_DIFF = data:AddDifficulty(AL["Normal"], "NormalRaidWithPreset", {
+	Item = {
+		item2bonus = "BfAMaxItemLvl",
+		autoCompleteItem2 = true,
+		addDifficultyBonus = true,
+	},
+}, 14)
+local NORMAL_DUNGEON_DIFF = data:AddDifficulty(AL["Normal"], "DungeonWithPreset", {
+	Item = {
+		item1bonus = "Scaling",
+		item2bonus = "BfAMaxItemLvl",
+		autoCompleteItem2 = true,
+		addDifficultyBonus = true,
+	},
+}, 1)
+local HEROIC_DIFF = data:AddDifficulty(AL["Heroic"], "h", nil, 2)
+local HEROIC_DUNGEON_DIFF = data:AddDifficulty(AL["Heroic"], "HeroicDungeonWithPreset", {
+	Item = {
+		item2bonus = "BfAMaxItemLvl", --"BfAHCDungeonTitanforged",
+		autoCompleteItem2 = true,
+		addDifficultyBonus = true,
+	},
+}, 2)
+local MYTHICD_DIFF = data:AddDifficulty(AL["Mythic"], "h", nil, 23)
+local MYTHICD_DUNGEON_DIFF = data:AddDifficulty(AL["Mythic"], "MythicDungeonWithPreset", {
+	Item = {
+		item2bonus = "BfAMaxItemLvl",
+		autoCompleteItem2 = true,
+		addDifficultyBonus = true,
+	},
+}, 23)
+local MYTHICD2_DIFF = data:AddDifficulty(AL["Mythic"], "h", nil, 23)
+local MYTHICD2_DUNGEON_DIFF = data:AddDifficulty(AL["Mythic"], "MythicDungeon2WithPreset", {
+	Item = {
+		item1bonus = "LegionMDungeon2",
+		item2bonus = "BfAMaxItemLvl",
+		autoCompleteItem2 = true,
+		addDifficultyBonus = true,
+	},
+}, 23)
+local HEROIC_PRE_DIFF = data:AddDifficulty(AL["Heroic"], "HeroicWithPreset", {
+	Item = {
+		item2bonus = "BfAMaxItemLvl",
+		autoCompleteItem2 = true,
+		addDifficultyBonus = true,
+	},
+}, 15)
+local MYTHIC_DIFF = data:AddDifficulty(AL["Mythic"], "m", nil, 16)
+local MYTHIC_PRE_DIFF = data:AddDifficulty(AL["Mythic"], "MyhticWithPreset", {
+	Item = {
+		item2bonus = "BfAMaxItemLvl",
+		autoCompleteItem2 = true,
+		addDifficultyBonus = true,
+	},
+}, 16)
+
+local NORMAL_ITTYPE = data:AddItemTableType("Item", "Item")
+local RAID_ITTYPE = data:AddItemTableType("Item", "Item") -- Normal, Thunder-/Warforged...
+local AC_ITTYPE = data:AddItemTableType("Achievement", "Item")
+
+local DUNGEON_CONTENT = data:AddContentType(AL["Dungeons"], ATLASLOOT_DUNGEON_COLOR)
+local RAID_CONTENT = data:AddContentType(AL["Raids"], ATLASLOOT_RAID_COLOR)
+
+
+-- /////////////////////////////////
+-- Instance
+-- /////////////////////////////////
+--[[
+data["InstanceName"] = {
+	EncounterJournalID = 111,
+	MapID = 749,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT / RAID_CONTENT,
+	TableType = RAID_ITTYPE,
+	items =
+	{
+		{ -- bossN
+			EncounterJournalID = 1111,
+			[NORMAL_RAID_DIFF] = {
+				{ 1, 193711 }, -- temp
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+	}
+}
+]]
+
+data["The Rookery"] = {
+	EncounterJournalID = 1268,
+	MapID = 2315,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT,
+	items = {
+		{ -- Kyrioss
+			EncounterJournalID = 2566,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221034 }, -- Thunder-Clad Legguards
+				{ 2, 221032 }, -- Voltaic Stormcaller
+				{ 3, 221036 }, -- Tempestwind Handlers
+				{ 4, 221035 }, -- Treads of the Galvanic Skysoarer
+				{ 5, 221037 }, -- Charged Rookfeather Wraps
+				{ 6, 219294 }, -- Charged Stormrook Plume
+				{ 7, 221033 }, -- Hyperactive Stormclaw
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Stormguard Gorren
+			EncounterJournalID = 2567,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 219295 }, -- Sigil of Algari Concordance
+				{ 2, 221042 }, -- Squallrider's Kilt
+				{ 3, 221043 }, -- Cloudstrider Soles
+				{ 4, 221041 }, -- Boltbreaker Armor
+				{ 5, 221040 }, -- Lightning-Conductor's Bands
+				{ 6, 221038 }, -- Crashing Thunderhammer
+				{ 7, 221045 }, -- Galebreaker Bulwark
+				{ 8, 221039 }, -- Ireborne Stormbow
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Voidstone Monstrosity
+			EncounterJournalID = 2568,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221197 }, -- Hoop of the Blighted
+				{ 2, 221049 }, -- Jerkin of Awakened Stone
+				{ 3, 221048 }, -- Amice of Oblivion
+				{ 4, 221050 }, -- Ancient Hardened Legwraps
+				{ 5, 221046 }, -- Behemoth Kneebender
+				{ 6, 219296 }, -- Entropic Skardyn Core
+				{ 7, 221047 }, -- Monstrosity's Gaze
+				{ 8, 221044 }, -- Shadowskean of the Colossus
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+				{ 9, 223121 }, -- Formula: Enchanted Weathered Harbinger Crest
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = HEROIC_DUNGEON_DIFF,
+			},
+		},
+	}
+}
+
+data["The Stonevault"] = {
+	EncounterJournalID = 1269,
+	MapID = 2341,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT,
+	items = {
+		{ -- E.D.N.A.
+			EncounterJournalID = 2572,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221077 }, -- "Emergency Stop" Keychain
+				{ 2, 221076 }, -- E.D.N.A. Stabilizers
+				{ 3, 221075 }, -- Reinforced Anti-Intruder Chainmail
+				{ 4, 221073 }, -- Earthen Nullification Aegis
+				{ 5, 219315 }, -- Refracting Aggression Module
+				{ 6, 221078 }, -- Endoskeletal Polecrank
+				{ 7, 221074 }, -- Augmented Refractor Cannon
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Skarmorak
+			EncounterJournalID = 2579,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221082 }, -- Tainted Earthshard Walkers
+				{ 2, 221080 }, -- Corpseleecher Grips
+				{ 3, 221079 }, -- Crystal-Fissure Girdle
+				{ 4, 221081 }, -- Guise of the Construct
+				{ 5, 219300 }, -- Skarmorak Shard
+				{ 6, 221083 }, -- Wardbreaker of the Fractured
+				{ 7, 221084 }, -- Skardyn Mercybringer
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Master Machinists
+			EncounterJournalID = 2590,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221088 }, -- Anvilhide Cape
+				{ 2, 221087 }, -- Dorlita's Safety Belt
+				{ 3, 221086 }, -- Machinist's Searing Handguards
+				{ 4, 221085 }, -- Melodious Iron Songspire
+				{ 5, 219301 }, -- Overclocked Gear-a-Rang Launcher
+				{ 6, 219302 }, -- Scrapsinger's Symphony
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Void Speaker Eirich
+			EncounterJournalID = 2582,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 219303 }, -- High Speaker's Accretion
+				{ 2, 221092 }, -- Legplates of Broken Trust
+				{ 3, 221094 }, -- Whispering Umbral Mantle
+				{ 4, 221095 }, -- Shadowed Orator's Tunic
+				{ 5, 221089 }, -- Silver-Tongued Boltcaster
+				{ 6, 221090 }, -- Eirich's Fist of Deception
+				{ 7, 221091 }, -- Cutting-Edge Sermon
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+				{ 8,  223121 }, -- Formula: Enchanted Weathered Harbinger Crest
+				{ 9,  223122 }, -- Formula: Enchanted Runed Harbinger Crest
+				{ 10, 223123 }, -- Formula: Enchanted Gilded Harbinger Crest
+				{ 11, 223088 }, -- Design: Elusive Blasphemite
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = HEROIC_DUNGEON_DIFF,
+				{ 12, 221093 }, -- Deeply Corrupted Coil
+				{ 13, 223087 }, -- Design: Culminating Blasphemite
+				{ 14, 226683, "mount" }, -- Malfunctioning Mechsuit
+			},
+		},
+	}
+}
+
+data["Priory of the Sacred Flame"] = {
+	EncounterJournalID = 1267,
+	MapID = 2308,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT,
+	items = {
+		{ -- Captain Dailcry
+			EncounterJournalID = 2571,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 219308 }, -- Signet of the Priory
+				{ 2, 221118 }, -- Flameforged Armguard
+				{ 3, 221119 }, -- Holybound Grips
+				{ 4, 221121 }, -- Honorbound Retainer's Sash
+				{ 5, 221120 }, -- Stalwart Guardian's Boots
+				{ 6, 221117 }, -- Sanctified Priory Wall
+				{ 7, 221116 }, -- Glorious Defender's Poleaxe
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Baron Braunpyke
+			EncounterJournalID = 2570,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221123 }, -- Devoted Plate Walkers
+				{ 2, 221125 }, -- Helm of the Righteous Crusade
+				{ 3, 221124 }, -- Consecrated Baron's Bindings
+				{ 4, 221122 }, -- Hand of Beledar
+				{ 5, 221126 }, -- Zealous Warden's Raiment
+				{ 6, 219309 }, -- Tome of Light's Devotion
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Prioress Murrpray
+			EncounterJournalID = 2573,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221200 }, -- Radiant Necromancer's Band
+				{ 2, 221129 }, -- Divine Pyrewalkers
+				{ 3, 221203 }, -- Reanimator's Pyreforged Shoulders
+				{ 4, 221130 }, -- Seraphic Wraps of the Ordained
+				{ 5, 221131 }, -- Elysian Flame Crown
+				{ 6, 221127 }, -- Emberbrand Zweihander
+				{ 7, 219310 }, -- Bursting Lightshard
+				{ 8, 221128 }, -- Starforged Seraph's Mace
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+				{ 9,  223121 }, -- Formula: Enchanted Weathered Harbinger Crest
+				{ 10, 223122 }, -- Formula: Enchanted Runed Harbinger Crest
+				{ 11, 223123 }, -- Formula: Enchanted Gilded Harbinger Crest
+				{ 12, 223088 }, -- Design: Elusive Blasphemite
+				{ 13, 223098 }, -- Pattern: Waders of the Unifying Flame
+				{ 14, 223117 }, -- Formula: Enchant Ring - Radiant Mastery
+				{ 15, 223115 }, -- Formula: Enchant Ring - Radiant Critical Strike
+				{ 16, 223116 }, -- Formula: Enchant Ring - Radiant Haste
+				{ 17, 223118 }, -- Formula: Enchant Ring - Radiant Versatility
+				{ 18, 223120 }, -- Formula: Enchant Weapon - Authority of Radiant Power
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = HEROIC_DUNGEON_DIFF,
+			},
+		},
+	}
+}
+
+data["Ara-Kara, City of Echoes"] = {
+	EncounterJournalID = 1271,
+	MapID = 2357,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT,
+	items = {
+		{ -- Avanoxx
+			EncounterJournalID = 2583,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 219314 }, -- Ara-Kara Sacbrood
+				{ 2, 221151 }, -- Devourer's Gauntlets
+				{ 3, 221153 }, -- Gauzewoven Legguards
+				{ 4, 221150 }, -- Arachnoid Soulcleaver
+				{ 5, 221152 }, -- Silksteel Striders
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Anub'zekt
+			EncounterJournalID = 2584,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221154 }, -- Swarmcaller's Shroud
+				{ 2, 221158 }, -- Burrower's Cinch
+				{ 3, 221156 }, -- Cryptbound Headpiece
+				{ 4, 221155 }, -- Swarm Monarch's Spaulders
+				{ 5, 221157 }, -- Unbreakable Beetlebane Bindings
+				{ 6, 219316 }, -- Ceaseless Swarmgland
+				{ 7, 219315 }, -- Refracting Aggression Module
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Ki'katal the Harvester
+			EncounterJournalID = 2585,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221164 }, -- Archaic Venomancer's Footwraps
+				{ 2, 221160 }, -- Blight Hunter's Scalpelglaive
+				{ 3, 221162 }, -- Claws of Tainted Ichor
+				{ 4, 221161 }, -- Experimental Goresilk Chestguard
+				{ 5, 219317 }, -- Harvester's Edict
+				{ 6, 221159 }, -- Harvester's Interdiction
+				{ 7, 221165 }, -- Unceremonious Bloodletter
+				{ 8, 221163 }, -- Whispering Mask
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+				{ 9,  223121 }, -- Formula: Enchanted Weathered Harbinger Crest
+				{ 10, 223122 }, -- Formula: Enchanted Runed Harbinger Crest
+				{ 11, 223123 }, -- Formula: Enchanted Gilded Harbinger Crest
+				{ 12, 223088 }, -- Design: Elusive Blasphemite
+				{ 13, 223142 }, -- Formula: Enchant Ring - Cursed Mastery
+				{ 14, 223143 }, -- Formula: Enchant Ring - Cursed Versatility
+				{ 15, 223141 }, -- Formula: Enchant Ring - Cursed Critical Strike
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+	}
+}
+
+data["The Dawnbreaker"] = {
+	EncounterJournalID = 1270,
+	MapID = 2359,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT,
+	items = {
+		{ -- Speaker Shadowcrown
+			EncounterJournalID = 2580,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221136 }, -- Devout Zealot's Ring
+				{ 2, 221132 }, -- Overflowing Umbral Pail
+				{ 3, 221134 }, -- Shadow Congregant's Belt
+				{ 4, 221133 }, -- Girdle of Somber Ploys
+				{ 5, 219311 }, -- Void Pactstone
+				{ 6, 221135 }, -- Fanatic's Blackened Shoulderwraps
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Anub'ikkaj
+			EncounterJournalID = 2581,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221141 }, -- High Nerubian Signet
+				{ 2, 219312 }, -- Empowering Crystal of Anub'ikkaj
+				{ 3, 221139 }, -- Dark Priest's Carapace
+				{ 4, 221142 }, -- Scheming Assailer's Bands
+				{ 5, 221202 }, -- Defiance Crusher's Sabatons
+				{ 6, 221140 }, -- Shadowblight Mantle
+				{ 7, 221137 }, -- Black Shepherd's Guisarme
+				{ 8, 221138 }, -- Parson's Ornamented Blade
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Rasha'nan
+			EncounterJournalID = 2593,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221145 }, -- Shipwrecker's Bludgeon
+				{ 2, 221144 }, -- Zephyrous Sail Carver
+				{ 3, 221143 }, -- Recurved Hull Impaler
+				{ 4, 221146 }, -- Soaring Behemoth's Greathelm
+				{ 5, 221148 }, -- Epaulets of the Clipped Wings
+				{ 6, 221147 }, -- Goliath's Chitinous Chainmail
+				{ 7, 221149 }, -- Membranous Slippers
+				{ 8, 219313 }, -- Mereldar's Toll
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+	}
+}
+
+data["City of Threads"] = {
+	EncounterJournalID = 1274,
+	MapID = 2313,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT,
+	items = {
+		{ -- Orator Krix'vizk
+			EncounterJournalID = 2594,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221166 }, -- Krix'vizk's Speech Rod
+				{ 2, 221169 }, -- Whisperer's Echoing Steps
+				{ 3, 221168 }, -- Cinch of Lingering Influence
+				{ 4, 219318 }, -- Oppressive Orator's Larynx
+				{ 5, 221167 }, -- Vociferous Subjugator's Bracers
+				{ 6, 221170 }, -- Subduer's Terrorgrips
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Fangs of the Queen
+			EncounterJournalID = 2595,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221173 }, -- Legplates of Duality
+				{ 2, 221171 }, -- Kingslayer's Frostfang
+				{ 3, 221172 }, -- Pail of Preserved Obscurity
+				{ 4, 221175 }, -- Shadowchill Amice
+				{ 5, 221174 }, -- Penumbral Rimeguards
+				{ 6, 219319 }, -- Twin Fang Instruments
+				{ 7, 221176 }, -- Arachnofrost Vest
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- The Coaglamation
+			EncounterJournalID = 2600,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221181 }, -- Elder's Hemolymphal Periapt
+				{ 2, 221179 }, -- Coagulum Cuirass
+				{ 3, 221180 }, -- Gorebound Stranglers
+				{ 4, 221178 }, -- Ichor-Stained Sollerets
+				{ 5, 221182 }, -- Vitriolic Veinwoven Wraps
+				{ 6, 221177 }, -- Old-Blood Hielaman
+				{ 7, 219320 }, -- Viscous Coaglam
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Izo, the Grand Splicer
+			EncounterJournalID = 2596,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221189 }, -- Experiment 08752's Band
+				{ 2, 219321 }, -- Cirral Concoctory
+				{ 3, 221185 }, -- Flesh Connector's Epaulets
+				{ 4, 221186 }, -- Entwined Chimeric Legguards
+				{ 5, 221188 }, -- Viscera-Lathered Coat
+				{ 6, 221187 }, -- Intertwiner's Shadowcowl
+				{ 7, 221184 }, -- Surgical Heartstopper
+				{ 8, 221183 }, -- Splice 'n Dice
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+				{ 9,  223121 }, -- Formula: Enchanted Weathered Harbinger Crest
+				{ 10, 223122 }, -- Formula: Enchanted Runed Harbinger Crest
+				{ 11, 223123 }, -- Formula: Enchanted Gilded Harbinger Crest
+				{ 12, 223142 }, -- Formula: Enchant Ring - Cursed Mastery
+				{ 13, 223143 }, -- Formula: Enchant Ring - Cursed Versatility
+				{ 14, 223141 }, -- Formula: Enchant Ring - Cursed Critical Strike
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = HEROIC_DUNGEON_DIFF,
+				{ 15, 221174 }, -- Penumbral Rimeguards
+			},
+		},
+	}
+}
+
+data["Darkflame Cleft"] = {
+	EncounterJournalID = 1210,
+	MapID = 2303,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT,
+	items = {
+		{ -- Ol' Waxbeard
+			EncounterJournalID = 2569,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221097 }, -- Arcane Scuttle
+				{ 2, 219304 }, -- Conductor's Wax Whistle
+				{ 3, 221098 }, -- Mole Knight's Grimemail
+				{ 4, 221096 }, -- Rail Rider's Bisector
+				{ 5, 221099 }, -- Wick's Golden Loop
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Blazikon
+			EncounterJournalID = 2559,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221103 }, -- Flickering Glowtorc
+				{ 2, 219305 }, -- Carved Blazikon Wax
+				{ 3, 221100 }, -- Waxsteel Greathelm
+				{ 4, 221102 }, -- Shimmering Glimclaws
+				{ 5, 221101 }, -- Scent-Strong Candlecord
+				{ 6, 221104 }, -- Gleamwax Shackles
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- The Candle King
+			EncounterJournalID = 2560,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 219306 }, -- Burin of the Candle King
+				{ 2, 221109 }, -- Candlebearer's Shroud
+				{ 3, 221105 }, -- Dark Zone Headtaker
+				{ 4, 221107 }, -- Gleamkeeper's Buckle
+				{ 5, 221106 }, -- Gloomstomper's Sabatons
+				{ 6, 221108 }, -- King's Malicious Clutches
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- The Darkness
+			EncounterJournalID = 2561,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221112 }, -- Caliginous Claspers
+				{ 2, 221110 }, -- Crepuscular Carver
+				{ 3, 221113 }, -- Gloaming Visage
+				{ 4, 221115 }, -- Photophobic Amice
+				{ 5, 221111 }, -- Poleaxe of Somber Fate
+				{ 6, 219307 }, -- Remnant of Darkness
+				{ 7, 221114 }, -- Shadowspawn Leggings
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+				{ 8, 225548 }, -- Wick's Lead
+			},
+		},
+	}
+}
+
+data["Cinderbrew Meadery"] = {
+	EncounterJournalID = 1272,
+	MapID = 2335,
+	-- AtlasMapID = "",
+	ContentType = DUNGEON_CONTENT,
+	items = {
+		{ -- Brew Master Aldryr
+			EncounterJournalID = 2586,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221054 }, -- Chef Chewie's Towel
+				{ 2, 221053 }, -- Battle-Scarred Fisticuffs
+				{ 3, 221052 }, -- Foam-Ridden Pauldrons
+				{ 4, 219297 }, -- Cinderbrew Stein
+				{ 5, 221051 }, -- Crusher of the Unsettled
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- I'pa
+			EncounterJournalID = 2587,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221060 }, -- Strapped Rescue-Keg
+				{ 2, 221061 }, -- Hops-Laden Greatboots
+				{ 3, 221056 }, -- Vessel of the Beverage
+				{ 4, 221059 }, -- I'pa's Pale Aleguards
+				{ 5, 221058 }, -- Brewery Toiler's Waistband
+				{ 6, 221055 }, -- Cinderbrew-Soaked Cowl
+				{ 7, 221057 }, -- Sticky Stirring Stick
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Benk Buzzbee
+			EncounterJournalID = 2588,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221201 }, -- Fireproof Cinderbee Perch
+				{ 2, 221064 }, -- Fuzzy Cindercuffs
+				{ 3, 221063 }, -- Hivebreaker's Dipper
+				{ 4, 221065 }, -- Pollen-Lugger Treads
+				{ 5, 221067 }, -- Punctured Apiary Gloves
+				{ 6, 219298 }, -- Ravenous Honey Buzzer
+				{ 7, 221062 }, -- Scalding Queenmaker's Shiv
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+			},
+		},
+		{ -- Goldie Baronbottom
+			EncounterJournalID = 2589,
+			[NORMAL_DUNGEON_DIFF] = {
+				{ 1, 221198 }, -- 85-Year Tenure Ring
+				{ 2, 219299 }, -- Synergistic Brewterializer
+				{ 3, 221071 }, -- Backbreaking Bootstrappers
+				{ 4, 221069 }, -- Slashproof Business Plate
+				{ 5, 221070 }, -- "Azeroth's Greatest BEE.E.O." Cap
+				{ 6, 221072 }, -- Moneymaking Businessmantle
+				{ 7, 221068 }, -- Profit Divider
+				{ 8, 223155 }, -- Bop
+			},
+			[HEROIC_DUNGEON_DIFF] = {
+				GetItemsFromDiff = NORMAL_DUNGEON_DIFF,
+				{ 9,  223121 }, -- Formula: Enchanted Weathered Harbinger Crest
+				{ 10, 223122 }, -- Formula: Enchanted Runed Harbinger Crest
+				{ 11, 223123 }, -- Formula: Enchanted Gilded Harbinger Crest
+				{ 12, 223088 }, -- Design: Elusive Blasphemite
+				{ 13, 224424 }, -- Pattern: Artisan Chef's Hat
+				{ 14, 223102 }, -- Pattern: Busy Bee's Buckle
+			},
+			[MYTHICD_DUNGEON_DIFF] = {
+				GetItemsFromDiff = HEROIC_DUNGEON_DIFF,
+			},
+		},
+	}
+}
+
+data["Nerub-ar Palace"] = {
+	EncounterJournalID = 1273,
+	MapID = 2291,
+	-- AtlasMapID = "",
+	ContentType = RAID_CONTENT,
+	TableType = RAID_ITTYPE,
+	items = {
+		{ -- Ulgrax the Devourer
+			EncounterJournalID = 2607,
+			[NORMAL_RAID_DIFF] = {
+				{ 1,  212386 }, -- Husk of Swallowing Darkness
+				{ 2,  212423 }, -- Rebel's Drained Marrowslacks
+				{ 3,  212419 }, -- Bile-Soaked Harness
+				{ 4,  212428 }, -- Final Meal's Horns
+				{ 5,  219915 }, -- Foul Behemoth's Chelicera
+				{ 6,  212424 }, -- Seasoned Earthen Boulderplates
+				{ 7,  212388 }, -- Ulgrax's Morsel-Masher
+				{ 8,  212409 }, -- Venom-Etched Claw
+				{ 9,  212426 }, -- Crunchy Intruder's Wristband
+				{ 10, 212425 }, -- Devourer's Taut Innards
+				{ 11, 212442 }, -- Greatbelt of the Hungerer
+				{ 12, 212446 }, -- Royal Emblem of Nerub-ar
+				{ 13, 212431 }, -- Undermoth-Lined Footpads
+			},
+			[HEROIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+			[MYTHIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+		},
+		{ -- The Bloodbound Horror
+			EncounterJournalID = 2611,
+			[NORMAL_RAID_DIFF] = {
+				{ 1,  212404 }, -- Scepter of Manifested Miasma
+				{ 2,  212451 }, -- Aberrant Spellforge
+				{ 3,  212395 }, -- Blood-Kissed Kukri
+				{ 4,  212422 }, -- Bloodbound Horror's Legplates
+				{ 5,  212447 }, -- Key to the Unseeming
+				{ 6,  212417 }, -- Beyond's Dark Visage
+				{ 7,  212438 }, -- Polluted Spectre's Wraps
+				{ 8,  212439 }, -- Beacons of the False Dawn
+				{ 9,  212421 }, -- Goresplattered Membrane
+				{ 10, 212414 }, -- Lost Watcher's Remains
+				{ 11, 225590 }, -- Boots of the Black Bulwark
+				{ 12, 219917 }, -- Creeping Coagulum
+				{ 13, 212430 }, -- Shattered Eye Cincture
+			},
+			[HEROIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+			[MYTHIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+		},
+		{ -- Sikran, Captain of the Sureki
+			EncounterJournalID = 2599,
+			[NORMAL_RAID_DIFF] = {
+				{ 1,  212445 }, -- Chitin-Spiked Jackboots
+				{ 2,  212416 }, -- Cosmic-Tinged Treads
+				{ 3,  212392 }, -- Duelist's Dancing Steel
+				{ 4,  212405 }, -- Flawless Phase Blade
+				{ 5,  212413 }, -- Honored Executioner's Perforator
+				{ 6,  212449 }, -- Sikran's Endless Arsenal
+				{ 7,  212399 }, -- Splintershot Silkbow
+				{ 8,  225577 }, -- Sureki Zealot's Insignia
+				{ 9,  212415 }, -- Throne Defender's Bangles
+				{ 10, 212427 }, -- Visor of the Ascended Captain
+				{ 11, 225618 }, -- Dreadful Stalwart's Emblem
+				{ 12, 225619 }, -- Mystic Stalwart's Emblem
+				{ 13, 225620 }, -- Venerated Stalwart's Emblem
+				{ 14, 225621 }, -- Zenith Stalwart's Emblem
+				{ 15, 223097 }, -- Pattern: Adrenal Surge Clasp
+			},
+			[HEROIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+			[MYTHIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+		},
+		{ -- Rasha'nan
+			EncounterJournalID = 2609,
+			[NORMAL_RAID_DIFF] = {
+				{ 1,  225583 }, -- Behemoth's Eroded Cinch
+				{ 2,  212398 }, -- Bludgeons of Blistering Wind
+				{ 3,  212440 }, -- Devotee's Discarded Headdress
+				{ 4,  212448 }, -- Locket of Broken Memories
+				{ 5,  212391 }, -- Predator's Feasthooks
+				{ 6,  225586 }, -- Rasha'nan's Grotesque Talons
+				{ 7,  212437 }, -- Ravaged Lamplighter's Manacles
+				{ 8,  212453 }, -- Skyterror's Corrosive Organ
+				{ 9,  225574 }, -- Wings of Shattered Sorrow
+				{ 10, 225630 }, -- Dreadful Obscenity's Idol
+				{ 11, 225631 }, -- Mystic Obscenity's Idol
+				{ 12, 225632 }, -- Venerated Obscenity's Idol
+				{ 13, 225633 }, -- Zenith Obscenity's Idol
+				{ 14, 224435 }, -- Pattern: Duskthread Lining
+			},
+			[HEROIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+			[MYTHIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+		},
+		{ -- Broodtwister Ovi'nax
+			EncounterJournalID = 2612,
+			[NORMAL_RAID_DIFF] = {
+				{ 1,  225580 }, -- Accelerated Ascension Coil
+				{ 2,  225582 }, -- Assimilated Eggshell Slippers
+				{ 3,  212418 }, -- Black Blood Injectors
+				{ 4,  212387 }, -- Broodtwister's Grim Catalyst
+				{ 5,  220305 }, -- Ovi'nax's Mercurial Egg
+				{ 6,  225588 }, -- Sanguine Experiment's Bandages
+				{ 7,  212389 }, -- Spire of Transfused Horrors
+				{ 8,  225576 }, -- Writhing Ringworm
+				{ 9,  212452 }, -- Gruesome Syringe
+				{ 10, 225614 }, -- Dreadful Blasphemer's Effigy
+				{ 11, 225615 }, -- Mystic Blasphemer's Effigy
+				{ 12, 225616 }, -- Venerated Blasphemer's Effigy
+				{ 13, 225617 }, -- Zenith Blasphemer's Effigy
+				{ 14, 226190 }, -- Recipe: Sticky Sweet Treat
+			},
+			[HEROIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+			[MYTHIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+		},
+		{ -- Nexus-Princess Ky'veza
+			EncounterJournalID = 2601,
+			[NORMAL_RAID_DIFF] = {
+				{ 1,  212441 }, -- Bindings of the Starless Night
+				{ 2,  225591 }, -- Fleeting Massacre Footpads
+				{ 3,  225581 }, -- Ky'veza's Covert Clasps
+				{ 4,  225589 }, -- Nether Bounty's Greatbelt
+				{ 5,  225636 }, -- Regicide
+				{ 6,  212400 }, -- Shade-Touched Silencer
+				{ 7,  221023 }, -- Treacherous Transmitter
+				{ 8,  212456 }, -- Void Reaper's Contract
+				{ 9,  219877 }, -- Void Reaper's Warp Blade
+				{ 10, 225626 }, -- Dreadful Slayer's Icon
+				{ 11, 225627 }, -- Mystic Slayer's Icon
+				{ 12, 225628 }, -- Venerated Slayer's Icon
+				{ 13, 225629 }, -- Zenith Slayer's Icon
+				{ 14, 223048 }, -- Plans: Siphoning Stiletto
+			},
+			[HEROIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+			[MYTHIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+		},
+		{ -- The Silken Court
+			EncounterJournalID = 2608,
+			[NORMAL_RAID_DIFF] = {
+				{ 1,  212407 }, -- Anub'arash's Colossal Mandible
+				{ 2,  212443 }, -- Shattershell Greaves
+				{ 3,  225575 }, -- Silken Advisor's Favor
+				{ 4,  225584 }, -- Skeinspinner's Duplicitous Cuffs
+				{ 5,  220202 }, -- Spymaster's Web
+				{ 6,  212450 }, -- Swarmlord's Authority
+				{ 7,  212397 }, -- Takazj's Entropic Edict
+				{ 8,  212432 }, -- Thousand-Scar Impalers
+				{ 9,  212429 }, -- Whispering Voidlight Spaulders
+				{ 10, 225622 }, -- Dreadful Conniver's Badge
+				{ 11, 225623 }, -- Mystic Conniver's Badge
+				{ 12, 225624 }, -- Venerated Conniver's Badge
+				{ 13, 225625 }, -- Zenith Conniver's Badge
+				{ 14, 223094 }, -- Design: Magnificent Jeweler's Setting
+			},
+			[HEROIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+			[MYTHIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+		},
+		{ -- Queen Ansurek
+			EncounterJournalID = 2602,
+			[NORMAL_RAID_DIFF] = {
+				{ 1,  225634 }, -- Web-Wrapped Curio
+				{ 2,  225579 }, -- Crest of the Caustic Despot
+				{ 3,  225587 }, -- Devoted Offering's Irons
+				{ 4,  212444 }, -- Frame of Felled Insurgents
+				{ 5,  212435 }, -- Liquified Defector's Leggings
+				{ 6,  212454 }, -- Mad Queen's Mandate
+				{ 7,  212433 }, -- Omnivore's Venomous Camouflage
+				{ 8,  212434 }, -- Voidspoken Sarong
+				{ 9,  225585 }, -- Acrid Ascendant's Sash
+				{ 10, 212401 }, -- Ansurek's Final Judgment
+				{ 11, 212436 }, -- Clutches of Paranoia
+				{ 12, 212420 }, -- Queensguard Carapace
+				{ 13, 212394 }, -- Sovereign's Disdain
+				{ 14, 225578 }, -- Seal of the Poisoned Pact
+				{ 15, 223144 }, -- Formula: Enchant Weapon - Authority of the Depths
+				{ 16, 224147, "mount" }, -- Reins of the Sureki Skyrazor
+			},
+			[HEROIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+			},
+			[MYTHIC_PRE_DIFF] = {
+				GetItemsFromDiff = NORMAL_RAID_DIFF,
+				{ 17, 224151, "mount" }, -- Reins of the Ascendant Skyrazor
+			},
+		},
+	}
+}