diff --git a/mods/improved-roll-frames.lua b/mods/improved-roll-frames.lua
new file mode 100644
index 0000000..71f1656
--- /dev/null
+++ b/mods/improved-roll-frames.lua
@@ -0,0 +1,358 @@
+local T = ShaguTweaks.T
+
+local module = ShaguTweaks:register({
+    title = T["Improved Roll Frames"],
+    description = T["Smaller roll frames with roll tracking."],
+    expansions = { ["vanilla"] = true, ["tbc"] = nil },
+    category = T["General"],
+    enabled = nil,
+  })
+
+module.enable = function(self)
+    local _G = ShaguTweaks.GetGlobalEnv()
+    local font_default, font_size = "Fonts\\skurri.TTF", 14
+
+    ShaguTweaks.roll = CreateFrame("Frame", "STLootRoll", UIParent)
+    ShaguTweaks.roll.frames = {}
+
+    -- squash vanilla item placeholders
+    local LOOT_ROLL_GREED = string.gsub(LOOT_ROLL_GREED, "%%s|Hitem:%%d:%%d:%%d:%%d|h%[%%s%]|h%%s", "%%s")
+    local LOOT_ROLL_NEED = string.gsub(LOOT_ROLL_NEED, "%%s|Hitem:%%d:%%d:%%d:%%d|h%[%%s%]|h%%s", "%%s")
+    local LOOT_ROLL_PASSED = string.gsub(LOOT_ROLL_PASSED, "%%s|Hitem:%%d:%%d:%%d:%%d|h%[%%s%]|h%%s", "%%s")
+
+    -- try to detect the everyone string
+    local _, _, everyone, _ = strfind(LOOT_ROLL_ALL_PASSED, LOOT_ROLL_PASSED)
+    ShaguTweaks.roll.blacklist = { YOU, everyone }
+
+    ShaguTweaks.roll.cache = {}
+
+    ShaguTweaks.roll.scan = CreateFrame("Frame", "STLootRollMonitor", UIParent)
+    ShaguTweaks.roll.scan:RegisterEvent("CHAT_MSG_LOOT")
+    ShaguTweaks.roll.scan:SetScript("OnEvent", function()
+    local player, item = ShaguTweaks.cmatch(arg1, LOOT_ROLL_GREED)
+    if player and item then
+        ShaguTweaks.roll:AddCache(item, player, "GREED")
+        return
+    end
+
+    local player, item = ShaguTweaks.cmatch(arg1, LOOT_ROLL_NEED)
+    if player and item then
+        ShaguTweaks.roll:AddCache(item, player, "NEED")
+        return
+    end
+
+    local player, item = ShaguTweaks.cmatch(arg1, LOOT_ROLL_PASSED)
+    if player and item then
+        ShaguTweaks.roll:AddCache(item, player, "PASS")
+        return
+    end
+    end)
+
+    function ShaguTweaks.roll:AddCache(hyperlink, name, roll)
+    -- skip invalid names
+    for _, invalid in pairs(ShaguTweaks.roll.blacklist) do
+        if name == invalid then return end
+    end
+
+    local _, _, itemLink = string.find(hyperlink, "(item:%d+:%d+:%d+:%d+)")
+    local itemName = GetItemInfo(itemLink)
+
+    -- delete obsolete tables
+    if ShaguTweaks.roll.cache[itemName] and ShaguTweaks.roll.cache[itemName]["TIMESTAMP"] < GetTime() - 60 then
+        ShaguTweaks.roll.cache[itemName] = nil
+    end
+
+    -- initialize itemtable
+    if not ShaguTweaks.roll.cache[itemName] then
+        ShaguTweaks.roll.cache[itemName] = { ["GREED"] = {}, ["NEED"] = {}, ["PASS"] = {}, ["TIMESTAMP"] = GetTime() }
+    end
+
+    -- ignore already listed names
+    for _, existing in pairs(ShaguTweaks.roll.cache[itemName][roll]) do
+        if name == existing then return end
+    end
+
+    table.insert(ShaguTweaks.roll.cache[itemName][roll], name)
+
+    for id=1,4 do
+        if ShaguTweaks.roll.frames[id]:IsVisible() and ShaguTweaks.roll.frames[id].itemname == itemName then
+        local count_greed = ShaguTweaks.roll.cache[itemName] and table.getn(ShaguTweaks.roll.cache[itemName]["GREED"]) or 0
+        local count_need  = ShaguTweaks.roll.cache[itemName] and table.getn(ShaguTweaks.roll.cache[itemName]["NEED"]) or 0
+        local count_pass  = ShaguTweaks.roll.cache[itemName] and table.getn(ShaguTweaks.roll.cache[itemName]["PASS"]) or 0
+
+        ShaguTweaks.roll.frames[id].greed.count:SetText(count_greed > 0 and count_greed or "")
+        ShaguTweaks.roll.frames[id].need.count:SetText(count_need > 0 and count_need or "")
+        ShaguTweaks.roll.frames[id].pass.count:SetText(count_pass > 0 and count_pass or "")
+        end
+    end
+    end
+
+    function ShaguTweaks.roll:CreateLootRoll(id)
+    local size = 20
+    -- local rawborder, border = GetBorderSize()
+    local border = 4
+    local esize = 20
+    local f = CreateFrame("Frame", "STLootRollFrame" .. id, UIParent)
+
+    local function CreateBackdrop(f,b,a)
+        if not f then return end
+        f.backdrop = CreateFrame("Frame", nil, f)
+        f.backdrop:SetPoint("TOPLEFT", f, "TOPLEFT", -b, b)
+        f.backdrop:SetPoint("BOTTOMRIGHT", f, "BOTTOMRIGHT", b, -b)
+        f.backdrop:SetBackdrop({
+            bgFile = "Interface/Tooltips/UI-Tooltip-Background",
+            edgeFile = "Interface/Tooltips/UI-Tooltip-Border",
+            edgeSize = 12,
+            insets = { left = 4, right = 4, top = 4, bottom = 4 },
+        })
+
+        f.backdrop:SetBackdropColor(0, 0, 0, a)
+        f.backdrop:SetBackdropBorderColor(1, 1, 1, a)
+    end
+
+    CreateBackdrop(f, border, .1)
+    -- CreateBackdrop(f, nil, nil, .8)
+    -- CreateBackdropShadow(f)
+    f.backdrop:SetFrameStrata("BACKGROUND")
+    f.hasItem = 1
+
+    f:SetWidth(350)
+    f:SetHeight(size)
+
+    f.icon = CreateFrame("Button", "STLootRollFrame" .. id .. "Icon", f)
+    CreateBackdrop(f.icon, border, .1)
+    f.icon:SetPoint("LEFT", f, "LEFT", -30, 0)
+    f.icon:SetWidth(esize*1.2)
+    f.icon:SetHeight(esize*1.2)
+
+    f.icon.tex = f.icon:CreateTexture("OVERLAY")
+    f.icon.tex:SetTexCoord(.08, .92, .08, .92)
+    f.icon.tex:SetAllPoints(f.icon)
+
+    f.icon:SetScript("OnEnter", function()
+        GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
+        GameTooltip:SetLootRollItem(this:GetParent().rollID)
+        CursorUpdate()
+    end)
+
+    f.icon:SetScript("OnLeave", function()
+        GameTooltip:Hide()
+    end)
+
+    f.icon:SetScript("OnClick", function()
+        if IsControlKeyDown() then
+        DressUpItemLink(GetLootRollItemLink(this:GetParent().rollID))
+        elseif IsShiftKeyDown() then
+        if ChatEdit_InsertLink then
+            ChatEdit_InsertLink(GetLootRollItemLink(this:GetParent().rollID))
+        elseif ChatFrameEditBox:IsVisible() then
+            ChatFrameEditBox:Insert(GetLootRollItemLink(this:GetParent().rollID))
+        end
+        end
+    end)
+
+    f.need = CreateFrame("Button", "STLootRollFrame" .. id .. "Need", f)
+    f.need:SetPoint("LEFT", f.icon, "RIGHT", border*3, -1)
+    f.need:SetWidth(esize)
+    f.need:SetHeight(esize)
+    f.need:SetNormalTexture("Interface\\Buttons\\UI-GroupLoot-Dice-Up")
+    f.need:SetHighlightTexture("Interface\\Buttons\\UI-GroupLoot-Dice-Highlight")
+
+    f.need.count = f.need:CreateFontString("NEED")
+    f.need.count:SetPoint("CENTER", f.need, "CENTER", 0, 0)
+    f.need.count:SetJustifyH("CENTER")
+    f.need.count:SetFont(font_default, font_size, "OUTLINE")
+
+    f.need:SetScript("OnClick", function()
+        RollOnLoot(this:GetParent().rollID, 1)
+    end)
+    f.need:SetScript("OnEnter", function()
+        GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
+        GameTooltip:SetText("|cff33ffcc" .. NEED)
+        if f.itemname and ShaguTweaks.roll.cache[f.itemname] then
+        for _, player in pairs(ShaguTweaks.roll.cache[f.itemname]["NEED"]) do
+            GameTooltip:AddLine(player)
+        end
+        end
+        GameTooltip:Show()
+    end)
+    f.need:SetScript("OnLeave", function()
+        GameTooltip:Hide()
+    end)
+
+    f.greed = CreateFrame("Button", "STLootRollFrame" .. id .. "Greed", f)
+    f.greed:SetPoint("LEFT", f.icon, "RIGHT", border*5+esize, -2)
+    f.greed:SetWidth(esize)
+    f.greed:SetHeight(esize)
+    f.greed:SetNormalTexture("Interface\\Buttons\\UI-GroupLoot-Coin-Up")
+    f.greed:SetHighlightTexture("Interface\\Buttons\\UI-GroupLoot-Coin-Highlight")
+
+    f.greed.count = f.greed:CreateFontString("GREED")
+    f.greed.count:SetPoint("CENTER", f.greed, "CENTER", 0, 1)
+    f.greed.count:SetJustifyH("CENTER")
+    f.greed.count:SetFont(font_default, font_size, "OUTLINE")
+
+    f.greed:SetScript("OnClick", function()
+        RollOnLoot(this:GetParent().rollID, 2)
+    end)
+    f.greed:SetScript("OnEnter", function()
+        GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
+        GameTooltip:SetText("|cff33ffcc" .. GREED)
+        if f.itemname and ShaguTweaks.roll.cache[f.itemname] then
+        for _, player in pairs(ShaguTweaks.roll.cache[f.itemname]["GREED"]) do
+            GameTooltip:AddLine(player)
+        end
+        end
+        GameTooltip:Show()
+    end)
+    f.greed:SetScript("OnLeave", function()
+        GameTooltip:Hide()
+    end)
+
+    f.pass = CreateFrame("Button", "STLootRollFrame" .. id .. "Pass", f)
+    f.pass:SetPoint("LEFT", f.icon, "RIGHT", border*7+esize*2, 0)
+    f.pass:SetWidth(esize)
+    f.pass:SetHeight(esize)
+    f.pass:SetNormalTexture("Interface\\Buttons\\UI-GroupLoot-Pass-Up")
+    f.pass:SetHighlightTexture("Interface\\Buttons\\UI-GroupLoot-Coin-Highlight")
+
+    f.pass.count = f.pass:CreateFontString("PASS")
+    f.pass.count:SetPoint("CENTER", f.pass, "CENTER", 0, -1)
+    f.pass.count:SetJustifyH("CENTER")
+    f.pass.count:SetFont(font_default, font_size, "OUTLINE")
+
+    f.pass:SetScript("OnClick", function()
+        RollOnLoot(this:GetParent().rollID, 0)
+    end)
+    f.pass:SetScript("OnEnter", function()
+        GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
+        GameTooltip:SetText("|cff33ffcc" .. PASS)
+        if f.itemname and ShaguTweaks.roll.cache[f.itemname] then
+        for _, player in pairs(ShaguTweaks.roll.cache[f.itemname]["PASS"]) do
+            GameTooltip:AddLine(player)
+        end
+        end
+        GameTooltip:Show()
+    end)
+    f.pass:SetScript("OnLeave", function()
+        GameTooltip:Hide()
+    end)
+
+    f.boe = CreateFrame("Frame", "STLootRollFrame" .. id .. "BOE", f)
+    f.boe:SetPoint("LEFT", f.icon, "RIGHT", border*9+esize*3, 0)
+    f.boe:SetWidth(esize*2)
+    f.boe:SetHeight(esize)
+    f.boe.text = f.boe:CreateFontString("BOE")
+    f.boe.text:SetAllPoints(f.boe)
+    f.boe.text:SetJustifyH("LEFT")
+    f.boe.text:SetFont(font_default, font_size, "OUTLINE")
+
+    f.name = CreateFrame("Frame", "STLootRollFrame" .. id .. "Name", f)
+    f.name:SetPoint("LEFT", f.icon, "RIGHT", border*11+esize*4, 0)
+    f.name:SetPoint("RIGHT", f, "RIGHT", border*2, 0)
+    f.name:SetHeight(esize)
+    f.name.text = f.name:CreateFontString("NAME")
+    f.name.text:SetAllPoints(f.name)
+    f.name.text:SetJustifyH("LEFT")
+    f.name.text:SetFont(font_default, font_size, "OUTLINE")
+
+    f.time = CreateFrame("Frame", "STLootRollFrame" .. id .. "Time", f)
+    f.time:SetPoint("TOPLEFT", f, "TOPLEFT", 0, 0)
+    f.time:SetPoint("BOTTOMRIGHT", f, "BOTTOMRIGHT", 0, 0)
+    f.time:SetFrameStrata("LOW")
+    f.time.bar = CreateFrame("StatusBar", "STLootRollFrame" .. id .. "TimeBar", f.time)
+    f.time.bar:SetAllPoints(f.time)
+    -- f.time.bar:SetStatusBarTexture(pfUI.media["img:bar"])
+    f.time.bar:SetStatusBarTexture("Interface\\TargetingFrame\\UI-StatusBar")
+    f.time.bar:SetMinMaxValues(0, 100)
+    -- local r, g, b, a = strsplit(",", C.appearance.border.color)
+    local r, g, b, a = 255/255, 210/255, 0/255, 1
+    -- local r, g, b, a = 1, 1, 1, 1
+    f.time.bar:SetStatusBarColor(r, g, b)
+    f.time.bar:SetValue(20)
+    f.time.bar:SetScript("OnUpdate", function()
+        if not this:GetParent():GetParent().rollID then return end
+        local left = GetLootRollTimeLeft(this:GetParent():GetParent().rollID)
+        local min, max = this:GetMinMaxValues()
+        if left < min or left > max then left = min end
+        this:SetValue(left)
+    end)
+
+    return f
+    end
+
+    ShaguTweaks.roll:RegisterEvent("CANCEL_LOOT_ROLL")
+    ShaguTweaks.roll:SetScript("OnEvent", function()
+    for i=1,4 do
+        if ShaguTweaks.roll.frames[i].rollID == arg1 then
+        ShaguTweaks.roll.frames[i]:Hide()
+        end
+    end
+    end)
+
+    function _G.GroupLootFrame_OpenNewFrame(id, rollTime)
+    -- clear cache if possible
+    local visible = nil
+    for i=1,4 do
+        visible = visible or ShaguTweaks.roll.frames[i]:IsVisible()
+    end
+    if not visible then ShaguTweaks.roll.cache = {} end
+
+    -- setup roll frames
+    for i=1,4 do
+        if not ShaguTweaks.roll.frames[i]:IsVisible() then
+        ShaguTweaks.roll.frames[i].rollID = id
+        ShaguTweaks.roll.frames[i].rollTime = rollTime
+        ShaguTweaks.roll:UpdateLootRoll(i)
+        return
+        end
+    end
+    end
+
+    function ShaguTweaks.roll:UpdateLootRoll(id)
+    local texture, name, count, quality, bop = GetLootRollItemInfo(ShaguTweaks.roll.frames[id].rollID)
+    local color = ITEM_QUALITY_COLORS[quality]
+
+    ShaguTweaks.roll.frames[id].itemname = name
+
+    local count_greed = ShaguTweaks.roll.cache[name] and table.getn(ShaguTweaks.roll.cache[name]["GREED"]) or 0
+    local count_need  = ShaguTweaks.roll.cache[name] and table.getn(ShaguTweaks.roll.cache[name]["NEED"]) or 0
+    local count_pass  = ShaguTweaks.roll.cache[name] and table.getn(ShaguTweaks.roll.cache[name]["PASS"]) or 0
+
+    ShaguTweaks.roll.frames[id].greed.count:SetText(count_greed > 0 and count_greed or "")
+    ShaguTweaks.roll.frames[id].need.count:SetText(count_need > 0 and count_need or "")
+    ShaguTweaks.roll.frames[id].pass.count:SetText(count_pass > 0 and count_pass or "")
+
+    ShaguTweaks.roll.frames[id].name.text:SetText(name)
+    ShaguTweaks.roll.frames[id].name.text:SetTextColor(color.r, color.g, color.b, 1)
+    ShaguTweaks.roll.frames[id].icon.tex:SetTexture(texture)
+    ShaguTweaks.roll.frames[id].backdrop:SetBackdropBorderColor(color.r, color.g, color.b)
+    ShaguTweaks.roll.frames[id].time.bar:SetMinMaxValues(0, ShaguTweaks.roll.frames[id].rollTime)
+
+    -- if C.loot.raritytimer == "1" then
+        ShaguTweaks.roll.frames[id].time.bar:SetStatusBarColor(color.r, color.g, color.b, .5)
+    -- end
+
+    if bop then
+        -- ShaguTweaks.roll.frames[id].boe.text:SetText(T["BoP"])
+        ShaguTweaks.roll.frames[id].boe.text:SetText("BoP")
+        ShaguTweaks.roll.frames[id].boe.text:SetTextColor(1,.3,.3,1)
+    else
+        -- ShaguTweaks.roll.frames[id].boe.text:SetText(T["BoE"])
+        ShaguTweaks.roll.frames[id].boe.text:SetText("BoE")
+        ShaguTweaks.roll.frames[id].boe.text:SetTextColor(.3,1,.3,1)
+    end
+
+    ShaguTweaks.roll.frames[id]:Show()
+    end
+
+    for i=1,4 do
+    if not ShaguTweaks.roll.frames[i] then
+        ShaguTweaks.roll.frames[i] = ShaguTweaks.roll:CreateLootRoll(i)
+        -- ShaguTweaks.roll.frames[i]:SetPoint("CENTER", 0, -i*35)
+        ShaguTweaks.roll.frames[i]:SetPoint("CENTER", 15, i*35)
+        -- UpdateMovable(ShaguTweaks.roll.frames[i])
+        ShaguTweaks.roll.frames[i]:Hide()
+    end
+    end
+end