diff --git a/dot_local/bin/executable_river-exit b/dot_local/bin/executable_river-exit
index c2137bb..4ab3069 100644
--- a/dot_local/bin/executable_river-exit
+++ b/dot_local/bin/executable_river-exit
@@ -1,26 +1,41 @@
 #!/bin/sh
 
-river=$(ps -C river | awk '/river/')
+river=$(pgrep -x river)
 
 if [ -z "$river" ]; then
-  echo "error: $0: River is not running"
-  exit 1
-elif [ $# -ne 1 ]; then
-  echo "Usage: river-exit [command]"
-  echo "Commands: logout, poweroff, or reboot"
-  exit 1
+    echo "error: $0: River is not running"
+    exit 1
 fi
 
-if [ "$1" = "logout" ]; then
-  riverctl spawn 'reset'
-  riverctl exit
-elif [ "$1" = "poweroff" ]; then
-  riverctl spawn 'reset'
-  loginctl poweroff
-elif [ "$1" = "reboot" ]; then
-  riverctl spawn 'reset'
-  loginctl reboot
-else
-  echo "error: $0: unexpected argument"
-  exit 1
+if [ $# -ne 1 ]; then
+    echo "Usage: river-exit [command]"
+    echo "Commands: logout, poweroff, or reboot"
+    exit 1
 fi
+
+if [ "$1" = "logout" ] || [ "$1" = "poweroff" ] || [ "$1" = "reboot" ];then
+    riverctl spawn 'reset'
+
+    if [ "$1" = logout ];then
+        riverctl exit
+    elif [ "$1" = poweroff ] || [ "$1" = reboot ];then
+        loginctl "$1"
+    fi
+else
+    echo "error: $0: unexpected argument"
+    exit 1
+fi
+
+# if [ "$1" = "logout" ]; then
+#   riverctl spawn 'reset'
+#   riverctl exit
+# elif [ "$1" = "poweroff" ]; then
+#   riverctl spawn 'reset'
+#   loginctl poweroff
+# elif [ "$1" = "reboot" ]; then
+#   riverctl spawn 'reset'
+#   loginctl reboot
+# else
+#   echo "error: $0: unexpected argument"
+#   exit 1
+# fi