diff --git a/Altoholic-Addon/Altoholic/LootTableSetup.lua b/Altoholic-Addon/Altoholic/LootTableSetup.lua
index b21c6a3..fc65001 100644
--- a/Altoholic-Addon/Altoholic/LootTableSetup.lua
+++ b/Altoholic-Addon/Altoholic/LootTableSetup.lua
@@ -3875,6 +3875,132 @@ db.lootTable = {
 		},
 	},
 	
+	-- [BZ["Naxxramas"] ] = {
+		-- [BB["Malygos"]] = {
+			
+		-- },
+	-- },
+	[BZ["Naxxramas"] .. " (10)"] = {
+		[BB["Anub'Rekhan"]] = {
+			39139, 39140, 39141, 39146, 39188, 39189, 39190, 39191, 39192, 39193,
+		},
+		[BB["Grand Widow Faerlina"]] = {
+			39194, 39195, 39196, 39197, 39198, 39199, 39200, 39215, 39216, 39217,
+		},
+		[BB["Maexxna"]] = {
+			39221, 39224, 39225, 39226, 39228, 39229, 39230, 39231, 39232, 39233,
+		},
+		[BB["Patchwerk"]] = {
+			39261, 39262, 39267, 39270, 39271, 39272, 39273, 39274, 39275,
+		},
+		[BB["Grobbulus"]] = {
+			39276, 39277, 39278, 39279, 39280, 39281, 39282, 39283, 39284, 39285,
+		},
+		[BB["Thaddius"]] = {
+			39291, 39292, 39293, 39294, 39295, 40619, 40620, 40621,
+		},
+		[BB["Noth the Plaguebringer"]] = {
+			39234, 39235, 39236, 39237, 39239, 39240, 39241, 39242, 39243, 39244,
+		},
+		[BB["Heigan the Unclean"]] = {
+			39245, 39246, 39247, 39248, 39249, 39250, 39251, 39252, 39254, 39255,
+		},
+		[BB["Loatheb"]] = {
+			39256, 39257, 39258, 39259, 39260, 40622, 40623, 40624,
+		},
+		[BB["Instructor Razuvious"]] = {
+			39296, 39297, 39298, 39299, 39306, 39307, 39308, 39309, 39310, 39311,
+		},
+		[BB["Gothik the Harvester"]] = {
+			39344, 39345, 39369, 39379, 39386, 39388, 39389, 39390, 39391, 39392,
+		},
+		[BB["The Four Horsemen"]] = {
+			39393, 39394, 39395, 39396, 39397, 40610, 40611, 40612,
+		},
+		[BB["Sapphiron"]] = {
+			39398, 39399, 39401, 39403, 39404, 39405, 39407, 39408, 39409, 39415,
+			44569,
+		},
+		[BB["Kel'Thuzad"]] = {
+			39416, 39417, 39419, 39420, 39421, 39422, 39423, 39424, 39425, 39426,
+			40616, 40617, 40618,
+		},
+		[L["Trash Mobs"]] = {
+			39473, 39427, 39468, 39467, 39472, 39470,
+		},
+	},
+	[BZ["Naxxramas"] .. " (25)"] = {
+		[BB["Anub'Rekhan"]] = {
+			39701, 39702, 39703, 39704, 39706, 39712, 39714, 39716, 39717, 39718,
+			39719, 39720, 39721, 39722, 40064, 40065, 40069, 40071, 40074, 40075,
+			40080, 40107, 40108,
+		},
+		[BB["Grand Widow Faerlina"]] = {
+			39200, 39723, 39724, 39725, 39726, 39727, 39728, 39729, 39730, 39731,
+			39732, 39733, 39734, 39735, 39756, 39757, 40064, 40065, 40069, 40071,
+			40074, 40075, 40080, 40107, 40108,
+		},
+		[BB["Maexxna"]] = {
+			39230, 39758, 39759, 39760, 39761, 39762, 39763, 39764, 39765, 39766,
+			39767, 39768, 40060, 40061, 40062, 40063, 40250, 40251, 40252, 40253,
+			40254, 40255, 40256, 40257, 40258,
+		},
+		[BB["Patchwerk"]] = {
+			40064, 40065, 40069, 40071, 40074, 40075, 40080, 40107, 40108, 40259,
+			40260, 40261, 40262, 40263, 40264, 40265, 40266, 40267, 40268, 40269,
+			40270, 40271, 40272, 40273,
+		},
+		[BB["Grobbulus"]] = {
+			40250, 40251, 40252, 40253, 40254, 40255, 40256, 40257, 40258, 40274,
+			40275, 40277, 40278, 40279, 40280, 40281, 40282, 40283, 40284, 40285,
+			40287, 40288, 40289, 40351,
+		},
+		[BB["Thaddius"]] = {
+			40294, 40296, 40297, 40298, 40299, 40300, 40301, 40302, 40303, 40304,
+			40634, 40635, 40636,
+		},
+		[BB["Noth the Plaguebringer"]] = {
+			40064, 40065, 40069, 40071, 40074, 40075, 40080, 40107, 40108, 40184,
+			40185, 40186, 40187, 40188, 40189, 40190, 40191, 40192, 40193, 40196,
+			40197, 40198, 40200, 40602,
+		},
+		[BB["Heigan the Unclean"]] = {
+			40201, 40203, 40204, 40205, 40206, 40207, 40208, 40209, 40210, 40233,
+			40234, 40235, 40236, 40237, 40238, 40250, 40251, 40252, 40253, 40254,
+			40255, 40256, 40257, 40258,
+		},
+		[BB["Loatheb"]] = {
+			40239, 40240, 40241, 40242, 40243, 40244, 40245, 40246, 40247, 40249,
+			40637, 40638, 40639,
+		},
+		[BB["Instructor Razuvious"]] = {
+			40064, 40065, 40069, 40071, 40074, 40075, 40080, 40107, 40108, 40305,
+			40306, 40315, 40316, 40317, 40318, 40319, 40320, 40321, 40322, 40323,
+			40324, 40325, 40326, 40327,
+		},
+		[BB["Gothik the Harvester"]] = {
+			40250, 40251, 40252, 40253, 40254, 40255, 40256, 40257, 40258, 40328,
+			40329, 40330, 40331, 40332, 40333, 40334, 40335, 40336, 40337, 40338,
+			40339, 40340, 40341, 40342,
+		},
+		[BB["The Four Horsemen"]] = {
+			39397, 40286, 40343, 40344, 40345, 40346, 40347, 40348, 40349, 40350,
+			40352, 40610, 40611, 40612, 40625, 40626, 40627,
+		},
+		[BB["Sapphiron"]] = {
+			40362, 40363, 40365, 40366, 40367, 40368, 40369, 40370, 40371, 40372,
+			40373, 40374, 40375, 40376, 40377, 40378, 40379, 40380, 40381, 40382,
+			44569, 44577,
+		},
+		[BB["Kel'Thuzad"]] = {
+			40383, 40384, 40385, 40386, 40387, 40388, 40395, 40396, 40398, 40399,
+			40400, 40401, 40402, 40403, 40405, 40631, 40632, 40633,
+		},
+		[L["Trash Mobs"]] = {
+			40407, 40406, 40408, 40409, 40414, 40410, 40412,
+		},
+	},
+	
 	
 	-- 3.1
 	
diff --git a/Altoholic-Addon/Altoholic/Loots.lua b/Altoholic-Addon/Altoholic/Loots.lua
index 85b2df5..fbf450d 100644
--- a/Altoholic-Addon/Altoholic/Loots.lua
+++ b/Altoholic-Addon/Altoholic/Loots.lua
@@ -11,7 +11,7 @@ local GREEN		= "|cFF00FF00"
 
 local lootTable, lootTableRev_Single, lootTableRev_Multi
 local LootSourceTooltipDB = {}
-local LootSourceTooltip_VERSION = 18.015
+local LootSourceTooltip_VERSION = 18.018
 
 
 local DataProviders