diff --git a/Modules/BonkDetector.lua b/Modules/BonkDetector.lua
index c9654e6..4b15884 100644
--- a/Modules/BonkDetector.lua
+++ b/Modules/BonkDetector.lua
@@ -12,13 +12,13 @@ function shared.BonkDetector.Init()
 	local frame = CreateFrame("Frame")
 	frame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	frame:SetScript("OnEvent", function(self, event, ...)
---		if Heimdall_Data.config.bonkDetector.debug then
---			print(string.format("[%s] Combat log event received", ModuleName))
---		end
+		--		if Heimdall_Data.config.bonkDetector.debug then
+		--			print(string.format("[%s] Combat log event received", ModuleName))
+		--		end
 		if not Heimdall_Data.config.bonkDetector.enabled then
---			if Heimdall_Data.config.bonkDetector.debug then
---				print(string.format("[%s] Module disabled, ignoring combat event", ModuleName))
---			end
+			--			if Heimdall_Data.config.bonkDetector.debug then
+			--				print(string.format("[%s] Module disabled, ignoring combat event", ModuleName))
+			--			end
 			return
 		end
 
@@ -86,32 +86,22 @@ function shared.BonkDetector.Init()
 				ModuleName, source, destination, subevent))
 		end
 
-		local notifyChannel = Heimdall_Data.config.bonkDetector.notifyChannel
-		local msg = string.format("%s hit %s (%s)", source, destination, subevent)
-		if Heimdall_Data.config.bonkDetector.debug then
-			print(string.format("[%s] Queueing message to Agent channel: %s", ModuleName, msg))
-		end
-		---@type Message
-		local message = {
-			channel = "C",
-			data = notifyChannel,
-			message = string.format(shared.L.en.bonkDetected, source, destination, subevent),
-		}
-		if Heimdall_Data.config.bonkDetector.debug then
-			print(string.format("[%s] Queueing English message: %s", ModuleName, message.message))
-		end
-		table.insert(shared.messenger.queue, message)
-
-		if Heimdall_Data.config.echoToRussian then
-			-- Russian message
-			local ruMessage = {
+		for _, channel in pairs(Heimdall_Data.config.bonkDetector.channels) do
+			local locale = shared.GetLocaleForChannel(channel)
+			local msg = string.format(shared._L("bonkDetected", locale), source, destination, subevent)
+			---@type Message
+			local message = {
 				channel = "C",
-				data = notifyChannel .. "ru",
-				message = string.format(shared.L.ru.bonkDetected, source, destination, subevent),
+				data = channel,
+				message = msg,
 			}
-			table.insert(shared.messenger.queue, ruMessage)
+			if Heimdall_Data.config.bonkDetector.debug then
+				print(string.format("[%s] Queuing bonk detector message", ModuleName))
+				shared.dumpTable(message)
+			end
+			table.insert(shared.messenger.queue, message)
 		end
 	end)
 
 	print("[Heimdall] BonkDetector loaded")
-end 
\ No newline at end of file
+end