diff --git a/shootyepgp.lua b/shootyepgp.lua
index 86e152f..6441ed8 100644
--- a/shootyepgp.lua
+++ b/shootyepgp.lua
@@ -1011,26 +1011,20 @@ function sepgp:bidPrint(link, masterlooter, need, greed, bid)
   PlaySoundFile("Interface\\AddOns\\shootyepgp\\Sounds\\loot.wav")
 
   -- Decide which placeholders to keep/remove based on need/greed/bid
-  if (need and greed) then
+  if (need and greed) or bid then
     -- Keep all three
-    msg = string.gsub(msg, "$MS",   mslink)
+    msg = string.gsub(msg, "$MS", mslink)
     msg = string.gsub(msg, "$PRIOOS", priooslink)
-    msg = string.gsub(msg, "$OS",   oslink)
-  elseif (need) then
-    -- Only show MS + MSOS, remove the OS part
-    msg = string.gsub(msg, "$MS",   mslink)
-    msg = string.gsub(msg, "$PRIOOS", priooslink)
-    msg = string.gsub(msg, " or $OS", "")
-  elseif (greed) then
-    -- Only show OS, remove MS + MSOS
     msg = string.gsub(msg, "$OS", oslink)
-    -- remove "$MS or $MSOS or " (or your exact localized phrase)
-    msg = string.gsub(msg, "$MS or $PRIOOS or ", "")
-  elseif (bid) then
-    -- If 'bid' is true, we keep all (same as need+greed)
-    msg = string.gsub(msg, "$MS",   mslink)
+  elseif (need) then
+    -- Only show MS, remove the others
+    msg = string.gsub(msg, "$MS", mslink)
+    msg = string.gsub(msg, " or $PRIOOS or $OS", "")
+  elseif (greed) then
+    -- Only show OS and PRIOOS, remove MS
     msg = string.gsub(msg, "$PRIOOS", priooslink)
-    msg = string.gsub(msg, "$OS",   oslink)
+    msg = string.gsub(msg, "$OS", oslink)
+    msg = string.gsub(msg, "$MS or ", "")
   end
 
   -- If there's still an un-replaced placeholder, exit
diff --git a/shootyepgp.toc b/shootyepgp.toc
index 5ec3ff9..c2cfe91 100644
--- a/shootyepgp.toc
+++ b/shootyepgp.toc
@@ -7,7 +7,7 @@
 ## X-Website: https://github.com/cinecom/shootyepgp/
 ## X-Category: Guild
 ## X-Credits: shooty, Qcat(zhCN)
-## Version: 3.83 <ERROR>
+## Version: 3.85 <ERROR>
 ## X-Alpha: 
 ## OptionalDeps: Ace2
 ## SavedVariables: sepgp_saychannel, sepgp_groupbyclass, sepgp_groupbyarmor, sepgp_groupbyrole, sepgp_raidonly, sepgp_dbver, sepgp_debug, sepgp_fubar