diff --git a/AtlasLoot/Core/LootButtons.lua b/AtlasLoot/Core/LootButtons.lua
index cd4b4de..87fea00 100644
--- a/AtlasLoot/Core/LootButtons.lua
+++ b/AtlasLoot/Core/LootButtons.lua
@@ -69,7 +69,9 @@ function AtlasLootItem_OnEnter(self)
                     if ( AtlasLoot.db.profile.ItemIDs ) then
                         AtlasLootTooltip:AddLine(BLUE..AL["ItemID:"].." "..self.itemID, nil, nil, nil, 1);
                     end
-                    if( self.droprate ~= nil) then
+                    if( self.droprate ~= nil) and ( self.droprate:match("=EI=") ) then
+                        AtlasLootTooltip:AddLine(AL["Extra Info: "]..string.sub(self.droprate, 5), 1, 1, 0);
+                    elseif( self.droprate ~= nil) then
                         AtlasLootTooltip:AddLine(AL["Drop Rate: "]..self.droprate, 1, 1, 0);
                     end
                     if( DKP ~= nil and DKP ~= "" ) then
@@ -96,8 +98,10 @@ function AtlasLootItem_OnEnter(self)
                     if ( AtlasLoot.db.profile.ItemIDs ) then
                         AtlasLootTooltip:AddLine(BLUE..AL["ItemID:"].." "..self.itemID, nil, nil, nil, 1);
                     end
-                    if( self.droprate ~= nil) then
-                        AtlasLootTooltip:AddLine(AL["Drop Rate: "]..self.droprate, 1, 1, 0, 1);
+                    if( self.droprate ~= nil) and (self.droprate:match("=EI=")) then
+                        AtlasLootTooltip:AddLine(AL["Extra Info: "]..string.sub(self.droprate, 5), 1, 1, 0);
+                    elseif( self.droprate ~= nil) then
+                        AtlasLootTooltip:AddLine(AL["Drop Rate: "]..self.droprate, 1, 1, 0);
                     end
                     if( DKP ~= nil and DKP ~= "" ) then
                         AtlasLootTooltip:AddLine(RED..DKP.." "..AL["DKP"], 1, 1, 0);
@@ -118,8 +122,10 @@ function AtlasLootItem_OnEnter(self)
                 if ( AtlasLoot.db.profile.ItemIDs ) then
                     GameTooltip:AddLine(BLUE..AL["ItemID:"].." "..self.itemID, nil, nil, nil, 1);
                 end
-                if( self.droprate ~= nil) then
-                    GameTooltip:AddLine(AL["Drop Rate: "]..self.droprate, 1, 1, 0);
+                if( self.droprate ~= nil) and ( self.droprate:match("=EI=") ) then
+                    AtlasLootTooltip:AddLine(AL["Extra Info: "]..string.sub(self.droprate, 5), 1, 1, 0);
+                elseif( self.droprate ~= nil) then
+                    AtlasLootTooltip:AddLine(AL["Drop Rate: "]..self.droprate, 1, 1, 0);
                 end
                 if( DKP ~= nil and DKP ~= "" ) then
                     GameTooltip:AddLine(RED..DKP.." "..AL["DKP"], 1, 1, 0);
@@ -141,7 +147,9 @@ function AtlasLootItem_OnEnter(self)
                         if ( AtlasLoot.db.profile.ItemIDs ) then
                             AtlasLootTooltip:AddLine(BLUE..AL["ItemID:"].." "..self.itemID, nil, nil, nil, 1);
                         end
-                        if( self.droprate ~= nil) then
+                        if( self.droprate ~= nil) and ( self.droprate:match("=EI=") ) then
+                            AtlasLootTooltip:AddLine(AL["Extra Info: "]..string.sub(self.droprate, 5), 1, 1, 0);
+                        elseif( self.droprate ~= nil) then
                             AtlasLootTooltip:AddLine(AL["Drop Rate: "]..self.droprate, 1, 1, 0);
                         end
                         if( DKP ~= nil and DKP ~= "" ) then
diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua
index daa2b4e..83a0f31 100644
--- a/AtlasLoot/Locales/constants.en.lua
+++ b/AtlasLoot/Locales/constants.en.lua
@@ -26,6 +26,7 @@ if AL then
 	AL["Select Sub-Table"] = true;
 	AL["Select Difficulty"] = true;
 	AL["Drop Rate: "] = true;
+	AL["Extra Info: "] = true;
 	AL["DKP"] = true;
 	AL["Priority:"] = true;
 	AL["Click boss name to view loot."] = true;
diff --git a/AtlasLoot_Crafting/craftingCLASSIC.lua b/AtlasLoot_Crafting/craftingCLASSIC.lua
index 46b6614..497a22c 100644
--- a/AtlasLoot_Crafting/craftingCLASSIC.lua
+++ b/AtlasLoot_Crafting/craftingCLASSIC.lua
@@ -872,12 +872,13 @@ AtlasLoot_Data["EngineeringCLASSIC"] = {
 	Type = "Crafting";
 	{
 		Name = AL["Ammunition"];
-		{ 1, "s19800", "15997", "=q2=Thorium Shells", "=ds=#sr# 285" };
-		{ 2, "s12621", "10513", "=q2=Mithril Gyro-Shot", "=ds=#sr# 245" };
-		{ 3, "s12596", "10512", "=q2=Hi-Impact Mithril Slugs", "=ds=#sr# 210" };
-		{ 4, "s3947", "8069", "=q1=Crafted Solid Shot", "=ds=#sr# 125" };
-		{ 5, "s3930", "8068", "=q1=Crafted Heavy Shot", "=ds=#sr# 75" };
-		{ 6, "s3920", "8067", "=q1=Crafted Light Shot", "=ds=#sr# 1" };
+		{ 1, 18042, "", "=q2=Thorium Headed Arrow", "Quest See Tooltip", "", "=EI=Trade Thorium Shells With\nArtilleryman Sheldonore in Ironforge\nBounty Hunter Kolark in Orgrimmar" };
+		{ 2, "s19800", "15997", "=q2=Thorium Shells", "=ds=#sr# 285" };
+		{ 3, "s12621", "10513", "=q2=Mithril Gyro-Shot", "=ds=#sr# 245" };
+		{ 4, "s12596", "10512", "=q2=Hi-Impact Mithril Slugs", "=ds=#sr# 210" };
+		{ 5, "s3947", "8069", "=q1=Crafted Solid Shot", "=ds=#sr# 125" };
+		{ 6, "s3930", "8068", "=q1=Crafted Heavy Shot", "=ds=#sr# 75" };
+		{ 7, "s3920", "8067", "=q1=Crafted Light Shot", "=ds=#sr# 1" };
 	};
 	{
 		Name = BabbleInventory["Armor"];