diff --git a/ItemRack/ItemRack.lua b/ItemRack/ItemRack.lua
index 37ba193..5162d68 100644
--- a/ItemRack/ItemRack.lua
+++ b/ItemRack/ItemRack.lua
@@ -3,7 +3,7 @@ ItemRack = {}
 local disable_delayed_swaps = nil -- temporary. change nil to 1 to stop attempting to delay set swaps while casting
 local _
 
-ItemRack.Version = "3.27"
+ItemRack.Version = "3.30"
 
 ItemRackUser = {
 	Sets = {}, -- user's sets
@@ -394,7 +394,6 @@ function ItemRack.InitCore()
 	ItemRack.CreateTimer("MenuMouseover",ItemRack.MenuMouseover,.25,1)
 	ItemRack.CreateTimer("TooltipUpdate",ItemRack.TooltipUpdate,1,1)
 	ItemRack.CreateTimer("CooldownUpdate",ItemRack.CooldownUpdate,1,1)
-	ItemRack.CreateTimer("CheckForMountedEvents",ItemRack.CheckForMountedEvents,.5,1)
 	ItemRack.CreateTimer("MinimapDragging",ItemRack.MinimapDragging,0,1)
 	ItemRack.CreateTimer("LocksChanged",ItemRack.LocksChanged,.2)
 	ItemRack.CreateTimer("MinimapShine",ItemRack.MinimapShineUpdate,0,1)
@@ -431,7 +430,6 @@ function ItemRack.InitCore()
 		-- ItemRackFrame:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED")
 	--end
 	ItemRack.StartTimer("CooldownUpdate")
-	ItemRack.StartTimer("CheckForMountedEvents")
 	ItemRack.MoveMinimap()
 	ItemRack.ReflectAlpha()
 	ItemRack.SetSetBindings()
@@ -1367,17 +1365,17 @@ function ItemRack.UpdateCombatQueue()
 			queue:Hide()
 		end
 	end
-	if PaperDollFrame:IsVisible() then
-		for i=1,19 do
-			queue = _G["Character"..ItemRack.SlotInfo[i].name.."Queue"]
-			if ItemRack.CombatQueue[i] then
-				queue:SetTexture(select(2,ItemRack.GetInfoByID(ItemRack.CombatQueue[i])))
-				queue:Show()
-			else
-				queue:Hide()
-			end
+
+	for i=1,19 do
+		queue = _G["Character"..ItemRack.SlotInfo[i].name.."Queue"]
+		if ItemRack.CombatQueue[i] then
+			queue:SetTexture(select(2,ItemRack.GetInfoByID(ItemRack.CombatQueue[i])))
+			queue:Show()
+		else
+			queue:Hide()
 		end
 	end
+
 end
 
 --[[ Tooltip ]]
@@ -2042,4 +2040,4 @@ function ItemRack.ProfileFuncs()
 		end
 		table.insert(TinyPadPages,info)
 	end
-end
\ No newline at end of file
+end
diff --git a/ItemRack/ItemRack.toc b/ItemRack/ItemRack.toc
index 89715ad..054537d 100644
--- a/ItemRack/ItemRack.toc
+++ b/ItemRack/ItemRack.toc
@@ -1,4 +1,4 @@
-## Interface: 11302
+## Interface: 11303
 ## Title: ItemRack
 ## Author: Gello - Updated for Classic by Rottenbeer
 ## SavedVariables: ItemRackSettings, ItemRackItems, ItemRackEvents
diff --git a/ItemRack/ItemRackEvents.lua b/ItemRack/ItemRackEvents.lua
index efc48ca..b0a6669 100644
--- a/ItemRack/ItemRackEvents.lua
+++ b/ItemRack/ItemRackEvents.lua
@@ -201,8 +201,9 @@ end
 function ItemRack.InitEvents()
 	ItemRack.LoadEvents()
 
-	ItemRack.CreateTimer("EventsBuffTimer",ItemRack.ProcessBuffEvent,.50)
-	ItemRack.CreateTimer("EventsZoneTimer",ItemRack.ProcessZoneEvent,.33)
+	ItemRack.CreateTimer("EventsBuffTimer",ItemRack.ProcessBuffEvent,.15)
+	ItemRack.CreateTimer("EventsZoneTimer",ItemRack.ProcessZoneEvent,.16)
+	ItemRack.CreateTimer("CheckForMountedEvents",ItemRack.CheckForMountedEvents,.5,1)
 
 	if ItemRackButton20Queue then
 		ItemRackButton20Queue:SetTexture("Interface\\AddOns\\ItemRack\\ItemRackGear")
@@ -216,6 +217,7 @@ end
 function ItemRack.RegisterEvents()
 	local frame = ItemRackEventProcessingFrame
 	frame:UnregisterAllEvents()
+	ItemRack.StopTimer("CheckForMountedEvents")
 	ItemRack.ReflectEventsRunning()
 	if ItemRackUser.EnableEvents=="OFF" then
 		return
@@ -243,6 +245,8 @@ function ItemRack.RegisterEvents()
 			end
 		end
 	end
+	ItemRack.StartTimer("CheckForMountedEvents")
+
 	ItemRack.ProcessStanceEvent()
 	ItemRack.ProcessZoneEvent()
 	ItemRack.ProcessBuffEvent()
diff --git a/ItemRackOptions/ItemRackOptions.toc b/ItemRackOptions/ItemRackOptions.toc
index 138f931..0ac6827 100644
--- a/ItemRackOptions/ItemRackOptions.toc
+++ b/ItemRackOptions/ItemRackOptions.toc
@@ -1,4 +1,4 @@
-## Interface: 11302
+## Interface: 11303
 ## Title: ItemRackOptions
 ## Notes: Load-On-Demand modules for ItemRack
 ## Dependencies: ItemRack, Blizzard_MacroUI