diff --git a/basics.yml b/basics.yml
index 5c567a4..87e2184 100644
--- a/basics.yml
+++ b/basics.yml
@@ -737,21 +737,14 @@
              esac
           done
           
+          message="$(cat)"
+          
           # If message should be sent by another host
           if [ -n "$tohost" ]
           then
-            if getent passwd signal >/dev/null
-            then
-              cat | sudo -u signal ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new -p33 $tohost " $@"
-            else
-              cat | ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new -p33 $tohost " $@"
-            fi
-            exit $?
+            cat | ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new -p33 $tohost " $@"
           fi
-          
-          message="$(cat)"
-          
-          
+
           
           [ "$message" = "''" ] && exit 0
           [ -z "$message" ] && exit 0
@@ -778,9 +771,11 @@
           
       
           ## MATRIX
+          room=$(hostname)
+          [ -n "$togroup" ] && room=$togroup
           if [ -f /home/docker/matrix.$(hostname)/matrix-commander-data/credentials.json ]
           then
-            docker compose -f /home/docker/matrix.$(hostname)/docker-compose.yml run -T matrix.$(hostname)--commander -m "$message" --log-level WARNING WARNING
+            docker compose -f /home/docker/matrix.$(hostname)/docker-compose.yml run -T matrix.$(hostname)--commander -k -m "$message" --room $room --log-level WARNING WARNING
           fi