diff --git a/rules.go b/rules.go
index 178416a..c459178 100644
--- a/rules.go
+++ b/rules.go
@@ -156,19 +156,11 @@ func resetMsgParsingRules() {
 								,(5000, ` + strconv.Itoa(objSubTypeMessageGoQuestAck) + `, "Go Quest Ack Devil's Valley", "^You went to the (?P<Place>[a-zA-Z ']+). Don't lose your soul. Back in (?P<Time>[0-9]+) minutes$")
 								,(5000, ` + strconv.Itoa(objSubTypeMessageGRolesReq) + `, "Guild roles Req", "^/g_roles$")
 								,(5000, ` + strconv.Itoa(objSubTypeMessageGRolesAck) + `, "Guild roles Req", "^Roles:\\nBartender:\\n` +
-		`((⚗️|⚔️|⚒)(?P<Bartender>.*)|\[unassigned\])\\n\\n\\n` +
+		`((⚗️|⚔️|⚒|🛡|📦)(?P<Bartender>.*)|.*\[unassigned\].*)\\n\\n\\n` +
 		`Commander:\\n` +
-		`((⚗️|⚔️|⚒)(?P<Commander>.*)|\[unassigned\])\\n\\n\\n` +
+		`((⚗️|⚔️|⚒|🛡|📦)(?P<Commander>.*)|.*\[unassigned\].*)\\n\\n\\n` +
 		`Squire:\\n` +
-		`((⚗️|⚔️|⚒)(?P<Squire>.*)|\[unassigned\])\\n\\n\\n` +
-		`Treasurer:\\n` +
-		`((⚗️|⚔️|⚒)(?P<Treasurer>.*)|\[unassigned\])$")
-								,(5000, ` + strconv.Itoa(objSubTypeMessageGRolesAck) + `, "Guild roles Req", "^Roles:\\nBartender:\\n` +
-		`((⚗️|⚔️|⚒|🛡|📦)(?P<Bartender>.*)|\[unassigned\])\\n\\n\\n` +
-		`Commander:\\n` +
-		`((⚗️|⚔️|⚒|🛡|📦)(?P<Commander>.*)|\[unassigned\])\\n\\n\\n` +
-		`Squire:\\n` +
-		`((⚗️|⚔️|⚒|🛡|📦)(?P<Squire>.*)|\[unassigned\])\\n\\n\\n` +
+		`((⚗️|⚔️|⚒|🛡|📦)(?P<Squire>.*)|.*\[unassigned\].*)\\n\\n\\n` +
 		`Treasurer:\\n` +
 		`((⚗️|⚔️|⚒|🛡|📦)(?P<Treasurer>.*)|.*\[unassigned\].*)$")
 								,(5000, ` + strconv.Itoa(objSubTypeMessageGStockReq) + `, "Guild stock Req", "^/g_stock$")