diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua
index f98b819..56a670b 100644
--- a/Modules/Whoer.lua
+++ b/Modules/Whoer.lua
@@ -259,7 +259,7 @@ function shared.Whoer.Init()
 				player.name,
 				player.stinky and "(!!!!)" or "",
 				shared._L(player.class, locale),
-				shared._L(player.race, locale),
+				--shared._L(player.race, locale),
 				shared._L(shared.raceMap[player.race] or "unknown", locale),
 				player.guild,
 				shared._L(player.zone, locale))
@@ -313,8 +313,9 @@ function shared.Whoer.Init()
 			local locale = shared.GetLocaleForChannel(channel)
 			local text = string.format(shared._L("whoerMoved", locale),
 				player.name,
+				player.stinky and "(!!!!)" or "",
 				shared._L(player.class, locale),
-				shared._L(player.race, locale),
+				--shared._L(player.race, locale),
 				shared._L(shared.raceMap[player.race] or "unknown", locale),
 				player.guild,
 				shared._L(zone, locale))
@@ -361,7 +362,10 @@ function shared.Whoer.Init()
 			local locale = shared.GetLocaleForChannel(channel)
 			local text = string.format(shared._L("whoerGone", locale),
 				player.name,
+				player.stinky and "(!!!!)" or "",
 				shared._L(player.class, locale),
+				--shared._L(player.race, locale),
+				shared._L(shared.raceMap[player.race] or "unknown", locale),
 				player.guild,
 				shared._L(player.zone, locale))
 
diff --git a/_L.lua b/_L.lua
index 3b124f8..6fa9493 100644
--- a/_L.lua
+++ b/_L.lua
@@ -10,10 +10,13 @@ shared._Locale = {
 		bonkDetected = "%s hit %s (%s)",
 		combatAlerterInCombat = "I am in combat with %s at %s (%s) at [%s](%2.2f, %2.2f)",
 		snifferStinky = "I smell a stinky %s",
-		spotterSpotted = "I see (%s) %s/%s %s of race %s (%s) with pvp %s and health %s/%s at %s (%s) [%s](%2.2f, %2.2f)",
-		whoerNew = "%s %s c:%s r:%s (%s) g:%s - %s",
-		whoerMoved = "%s c:%s (%s - %s) g:%s moved to %s",
-		whoerGone = "%s c:%s g:%s left %s",
+		spotterSpotted = "I see (%s) %s/%s %s r:%s (%s) pvp %s health %s/%s at %s (%s) [%s](%2.2f, %2.2f)",
+		--whoerNew = "%s %s c:%s (r:%s f:%s) g:%s arrived to %s",
+		--whoerMoved = "%s %s c:%s (r:%s - f:%s) g:%s moved to %s",
+		--whoerGone = "%s %s c:%s (r:%s - f:%s) g:%s left %s",
+		whoerNew = "%s%s; c:%s; f:%s; g:%s; arrived to %s",
+		whoerMoved = "%s%s; c:%s; f:%s; g:%s; moved to %s",
+		whoerGone = "%s%s; c:%s; f:%s; g:%s; left %s",
 		killed = "%s killed %s with %s in %s (%s) at [%s](%2.2f, %2.2f)",
 		friendly = "friendly",
 		unknown = "unknown",
@@ -90,11 +93,13 @@ shared._Locale = {
 		bonkDetected = "%s ударил %s (%s)",
 		combatAlerterInCombat = "Я в бою с %s на %s (%s) на [%s](%2.2f, %2.2f)",
 		snifferStinky = "Я чувствую запах %s",
-		spotterSpotted = "Я вижу (%s) %s/%s %s расы %s (%s) с pvp %s и здоровьем %s/%s на %s [%s](%2.2f, %2.2f)",
-		whoerNew =
-		"%s %s класса %s, расы %s (%s) гильдии %s в %s",
-		whoerMoved = "%s класса %s (%s - %s) и гильдии %s переместился в %s",
-		whoerGone = "%s класса %s и гильдии %s покинул %s",
+		spotterSpotted = "Я вижу (%s) %s/%s %s r:%s (%s) pvp %s здоровье %s/%s на %s [%s](%2.2f, %2.2f)",
+		--whoerNew = "%s %s к:%s (r:%s f:%s) g:%s прибыл в %s",
+		--whoerMoved = "%s %s к:%s (r:%s - f:%s) переместился в %s",
+		--whoerGone = "%s %s к:%s (r:%s - f:%s) покинул %s",
+		whoerNew = "%s%s; к:%s; f:%s; g:%s; прибыл в %s",
+		whoerMoved = "%s%s; к:%s; f:%s; g:%s; переместился в %s",
+		whoerGone = "%s%s; к:%s; f:%s; g:%s; покинул %s",
 		killed = "%s убил %s с %s в %s (%s) на [%s](%2.2f, %2.2f)",
 		friendly = "дружественный",
 		unknown = "неизвестный",
@@ -202,5 +207,6 @@ shared._Locale = {
 		["Undead"] = "Нежить",
 		["Alliance"] = "Альянс",
 		["Horde"] = "Орда",
+		["Suramar"] = "Сурамар",
 	},
 }