Pawn 

git diff -w ../Pawn/
diff --git a/Pawn/Pawn.lua b/Pawn/Pawn.lua
index f7e8152..fc924c5 100644
--- a/Pawn/Pawn.lua
+++ b/Pawn/Pawn.lua
@@ -1325,6 +1325,7 @@ function PawnGetAllItemValues(Item, ItemLevel, SocketBonus, UnenchantedItem, Une
        return ItemValues
 end
 
+local last_time = GetTime()
 -- Adds an array of item values to a tooltip, handling formatting options.
 -- Parameters: Tooltip, ItemValues, UpgradeInfo, BestItemFor, SecondBestItemFor, InvType, OnlyFirstValue
 --     Tooltip: The tooltip to annotate.  (Not a name.)
@@ -1342,6 +1343,13 @@ function PawnAddValuesToTooltip(Tooltip, ItemValues, UpgradeInfo, BestItemFor, S
        end
        if not ItemValues then return end
 
+       --Re-scan every 5 seconds to ensure new gear is added correctly.
+       local current_time = GetTime()
+       if current_time > last_time+5 then
+           last_time = current_time
+           PawnUIFrame_ResetUpgradesButton_OnClick()
+       end
+
        -- Loop through all of the item value subtables.
        local _, _, ClassID = UnitClass("player")
        local Entry, _

diff --git a/Pawn/Pawn.lua b/Pawn/Pawn.lua
index 00fe901..f7e8152 100644
--- a/Pawn/Pawn.lua
+++ b/Pawn/Pawn.lua
@@ -419,6 +419,11 @@ function PawnInitialize()
                PawnRecalculateScaleTotal(ScaleName)
        end
        
+       -- Reset/Rebuilds the best items, and tool tip during init phase
+       PawnClearCache()
+       PawnInvalidateBestItems()
+       PawnResetTooltips()
+
 end
 
 function PawnOnLogout()
@@ -2304,6 +2309,9 @@ end
 --             WasUpgraded - True if the item was upgraded while being "unenchanted."  (Always false if "ignore valor and baleful upgrades" is off.)
 -- (But if EvenIfNotEnchanted is true, the item link will be processed even if the item wasn't enchanted.)
 function PawnUnenchantItemLink(ItemLink, EvenIfNotEnchanted)
+    if UnitLevel("player") ~=  GetMaxPlayerLevel() then
+        return ItemLink
+    end
        local TrimmedItemLink = PawnStripLeftOfItemLink(ItemLink)
        local Pos, _, ItemID, EnchantID, GemID1, GemID2, GemID3, GemID4, SuffixID, MoreInfo, ViewAtLevel, SpecializationID, UpgradeLevel1, Difficulty, NumBonusIDs, BonusID1, BonusID2, BonusID3, BonusID4, BonusID5, BonusID6, BonusID7, BonusID8 = strfind(TrimmedItemLink, "^item:(%-?%d+):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%-?%d*):?(%-?%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*)")
        -- Note: After the specified number of bonus IDs would be UpgradeLevel2, which could be the level at which the item was acquired for timewarped items, or