diff --git a/broker.lua b/broker.lua
index 82b642d..c9eb25a 100755
--- a/broker.lua
+++ b/broker.lua
@@ -3,6 +3,10 @@ local childName = addon['childName']
 local child = addon[childName]
 local zzLDB = LibStub:GetLibrary("zzLDB")
 local L = LibStub("AceLocale-3.0"):GetLocale(childName, true)
+local LFG_EYE_TEXTURES = { };
+LFG_EYE_TEXTURES["default"] = { file = "Interface\\LFGFrame\\LFG-Eye", width = 512, height = 256, frames = 29, iconSize = 64, delay = 0.1 };
+LFG_EYE_TEXTURES["raid"] = { file = "Interface\\LFGFrame\\LFR-Anim", width = 256, height = 256, frames = 16, iconSize = 64, delay = 0.05 };
+LFG_EYE_TEXTURES["unknown"] = { file = "Interface\\LFGFrame\\WaitAnim", width = 128, height = 128, frames = 4, iconSize = 64, delay = 0.25 };
 for _, t in pairs(LFG_EYE_TEXTURES) do
 	local cols = floor(t.width / t.iconSize)
 	local colWidth = t.iconSize / t.width
diff --git a/core.lua b/core.lua
index ae4e1fa..59d7755 100755
--- a/core.lua
+++ b/core.lua
@@ -10,6 +10,10 @@ local function prepareDB()
 	addon['callbacks']:Fire(format("Init%s", childName))
 end
 
+local LFG_EYE_TEXTURES = { };
+LFG_EYE_TEXTURES["default"] = { file = "Interface\\LFGFrame\\LFG-Eye", width = 512, height = 256, frames = 29, iconSize = 64, delay = 0.1 };
+LFG_EYE_TEXTURES["raid"] = { file = "Interface\\LFGFrame\\LFR-Anim", width = 256, height = 256, frames = 16, iconSize = 64, delay = 0.05 };
+LFG_EYE_TEXTURES["unknown"] = { file = "Interface\\LFGFrame\\WaitAnim", width = 128, height = 128, frames = 4, iconSize = 64, delay = 0.25 };
 local currentQueueType
 local currentFrame = 1
 local currentIcon = LFG_EYE_TEXTURES.default
@@ -137,7 +141,8 @@ child['specs']  = {
 function events:PLAYER_ENTERING_WORLD(event)
 	child:UnregisterEvent('PLAYER_ENTERING_WORLD')
 	local  QSF = CreateFrame("Frame")
-	QueueStatusFrame_OnLoad(QSF)
+	Mixin(QSF, QueueStatusFrameMixin)
+--	QueueStatusFrame_OnLoad(QSF)
 	QSF:SetScript("OnEvent", OnEvent)
 	child:RegisterEvent({"LFG_UPDATE", "LFG_ROLE_CHECK_UPDATE", "LFG_PROPOSAL_UPDATE", "LFG_PROPOSAL_FAILED", "LFG_PROPOSAL_SUCCEEDED", "LFG_PROPOSAL_SHOW", "LFG_QUEUE_STATUS_UPDATE"}, OnEvent2)
 end