diff --git a/birdnet-pi/rootfs/custom-services.d/30-monitoring.sh b/birdnet-pi/rootfs/custom-services.d/30-monitoring.sh
index 8fa618267..33a41785d 100755
--- a/birdnet-pi/rootfs/custom-services.d/30-monitoring.sh
+++ b/birdnet-pi/rootfs/custom-services.d/30-monitoring.sh
@@ -1,72 +1,102 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
-# Adapted from https://github.com/mcguirepr89/BirdNET-Pi/issues/393#issuecomment-1166445710
+# Improved BirdNET-Pi Monitoring Script
+# Adapted and enhanced based on your original script.
 
 HOME="/home/pi"
 
-# Define logging functions
-log_green() { echo -e "\033[32m$1\033[0m"; }
-log_red() { echo -e "\033[31m$1\033[0m"; }
-log_yellow() { echo -e "\033[33m$1\033[0m"; }
-log_info() { echo -e "\033[34m$1\033[0m"; }
+########################################
+# Logging Functions
+########################################
+log_green()   { echo -e "\033[32m$1\033[0m"; }
+log_red()     { echo -e "\033[31m$1\033[0m"; }
+log_yellow()  { echo -e "\033[33m$1\033[0m"; }
+log_info()    { echo -e "\033[34m$1\033[0m"; }
 
+########################################
 # Read configuration
+########################################
 set +u
 # shellcheck disable=SC1091
 source /etc/birdnet/birdnet.conf
 
-# Wait 5 minutes
+########################################
+# Wait 5 minutes for system stabilization
+########################################
 sleep 5m
 
 log_green "Starting service: throttlerecording"
-touch "$HOME/BirdSongs/StreamData/analyzing_now.txt"
 
-# Set constants
-srv="birdnet_recording"
-srv2="birdnet_analysis"
-ingest_dir="$RECS_DIR/StreamData"
-counter=10
+########################################
+# Define Directories, Files, and Constants
+########################################
+INGEST_DIR="${RECS_DIR/StreamData:-$HOME/BirdSongs/StreamData}"
+ANALYZING_NOW_FILE="$INGEST_DIR/analyzing_now.txt"
+# Create the file if it does not exist.
+touch "$ANALYZING_NOW_FILE"
+
+# Ensure directories and set permissions
+mkdir -p "$INGEST_DIR" || { log_red "Failed to create directory: $INGEST_DIR"; exit 1; }
+chown -R pi:pi "$INGEST_DIR" || log_yellow "Could not change ownership for $INGEST_DIR"
+chmod -R 755 "$INGEST_DIR" || log_yellow "Could not set permissions for $INGEST_DIR"
+
+# Service names
+RECORDER_SERVICE="birdnet_recording"
+ANALYZER_SERVICE="birdnet_analysis"
+
+# Notification settings
+NOTIFICATION_INTERVAL=1800  # seconds (30 minutes)
 last_notification_time=0
 
-# Ensure directories and permissions
-mkdir -p "$ingest_dir"
-chown -R pi:pi "$ingest_dir"
-chmod -R 755 "$ingest_dir"
+# Disk usage threshold (percentage)
+DISK_USAGE_THRESHOLD=95
 
-# Function to send notifications using Apprise
+# "Analyzing" file check variables
+same_file_counter=0
+SAME_FILE_THRESHOLD=10  # number of iterations to consider the file as "stuck"
+# Initialize the content of analyzing_now from the file
+if [[ -f "$ANALYZING_NOW_FILE" ]]; then
+    analyzing_now=$(cat "$ANALYZING_NOW_FILE")
+else
+    analyzing_now=""
+fi
+
+########################################
+# Functions
+########################################
+
+# Send a notification using Apprise.
 apprisealert() {
     local issue_message="$1"
-    local current_time=$(date +%s)
-    local time_diff=$((current_time - last_notification_time))
+    local current_time
+    current_time=$(date +%s)
+    local time_diff=$(( current_time - last_notification_time ))
 
-    # Check if 30 minutes have passed since the last notification
-    if ((time_diff < 1800)); then
-        log_yellow "Notification suppressed to avoid spamming (last sent $time_diff seconds ago)"
+    # Throttle notifications
+    if (( time_diff < NOTIFICATION_INTERVAL )); then
+        log_yellow "Notification suppressed (last sent ${time_diff} seconds ago)"
         return
     fi
 
     local notification=""
     local stopped_service="<br><b>Stopped services:</b> "
 
-    # Check for stopped services
-    services=(birdnet_analysis chart_viewer spectrogram_viewer icecast2 birdnet_recording birdnet_log birdnet_stats)
+    # Check for stopped services (add or remove services as needed)
+    local services=(birdnet_analysis chart_viewer spectrogram_viewer icecast2 birdnet_recording birdnet_log birdnet_stats)
     for service in "${services[@]}"; do
-        if [[ "$(systemctl is-active "$service")" == "inactive" ]]; then
+        if [[ "$(systemctl is-active "$service")" != "active" ]]; then
             stopped_service+="$service; "
         fi
     done
 
-    # Build notification message
+    # Build the notification message in HTML format.
     notification+="<b>Issue:</b> $issue_message"
     notification+="$stopped_service"
-    notification+="<br><b>Additional information:</b>"
-    notification+="<br><b>Since:</b> ${LASTCHECK:-unknown}"
     notification+="<br><b>System:</b> ${SITE_NAME:-$(hostname)}"
     notification+="<br>Available disk space: $(df -h "$HOME/BirdSongs" | awk 'NR==2 {print $4}')"
     [[ -n "$BIRDNETPI_URL" ]] && notification+="<br><a href=\"$BIRDNETPI_URL\">Access your BirdNET-Pi</a>"
 
-    # Send notification
-    TITLE="BirdNET-Analyzer Alert"
+    local TITLE="BirdNET-Analyzer Alert"
     if [[ -f "$HOME/BirdNET-Pi/birdnet/bin/apprise" && -s "$HOME/BirdNET-Pi/apprise.txt" ]]; then
         "$HOME/BirdNET-Pi/birdnet/bin/apprise" -vv -t "$TITLE" -b "$notification" --input-format=html --config="$HOME/BirdNET-Pi/apprise.txt"
         last_notification_time=$current_time
@@ -75,54 +105,82 @@ apprisealert() {
     fi
 }
 
-# Main loop
+# Check and restart a given service if it is not active.
+check_and_restart_service() {
+    local service_name="$1"
+    local state
+    state=$(systemctl is-active "$service_name")
+    if [[ "$state" != "active" ]]; then
+        log_yellow "$(date) INFO: Restarting $service_name"
+        sudo systemctl restart "$service_name"
+        sleep 5
+        state=$(systemctl is-active "$service_name")
+        if [[ "$state" != "active" ]]; then
+            log_red "$(date) WARNING: $service_name could not restart"
+            apprisealert "$service_name cannot restart"
+        fi
+    fi
+}
+
+# Check disk usage and send a notification if above threshold.
+check_disk_space() {
+    local current_usage
+    current_usage=$(df -h "$HOME/BirdSongs" | awk 'NR==2 {print $5}' | sed 's/%//')
+    if (( current_usage >= DISK_USAGE_THRESHOLD )); then
+        log_red "$(date) WARNING: Disk usage is at ${current_usage}% (threshold is ${DISK_USAGE_THRESHOLD}%)"
+        apprisealert "Disk usage critical: ${current_usage}%"
+    fi
+}
+
+# Handle the file queue (number of .wav files in the ingest directory).
+handle_queue() {
+    local wav_count="$1"
+    if (( wav_count > 50 )); then
+        log_red "$(date) WARNING: Too many files in queue (>50). Pausing ${RECORDER_SERVICE} and restarting ${ANALYZER_SERVICE}"
+        apprisealert "Queue >50: ${RECORDER_SERVICE} paused, ${ANALYZER_SERVICE} restarted"
+        sudo systemctl stop "$RECORDER_SERVICE"
+        sudo systemctl restart "$ANALYZER_SERVICE"
+    elif (( wav_count > 30 )); then
+        log_red "$(date) WARNING: Queue growing (>30). Restarting ${ANALYZER_SERVICE}"
+        apprisealert "Queue >30: ${ANALYZER_SERVICE} restarted"
+        sudo systemctl restart "$ANALYZER_SERVICE"
+    else
+        # If the queue is normal, check both services.
+        check_and_restart_service "$RECORDER_SERVICE"
+        check_and_restart_service "$ANALYZER_SERVICE"
+    fi
+}
+
+########################################
+# Main Monitoring Loop
+########################################
 while true; do
     sleep 61
 
-    # Restart analysis if clogged
-    if ((counter <= 0)); then
-        current_file="$(cat "$ingest_dir/analyzing_now.txt")"
-        if [[ "$current_file" == "$analyzing_now" ]]; then
-            log_yellow "$(date) WARNING: No change in analyzing_now for 10 iterations, restarting services"
-            apprisealert "No change in analyzing_now for 10 iterations"
-            "$HOME/BirdNET-Pi/scripts/restart_services.sh"
-        fi
-        counter=10
+    # Check disk space usage first.
+    check_disk_space
+
+    # Check the content of the analyzing_now file to see if it has changed.
+    current_file=$(cat "$ANALYZING_NOW_FILE" 2>/dev/null)
+    if [[ "$current_file" == "$analyzing_now" ]]; then
+        (( same_file_counter++ ))
+    else
+        same_file_counter=0
         analyzing_now="$current_file"
     fi
 
-    # Check recorder state and queue length
-    wav_count=$(find -L "$ingest_dir" -maxdepth 1 -name '*.wav' | wc -l)
-    service_state=$(systemctl is-active "$srv")
-    analysis_state=$(systemctl is-active "$srv2")
-
-    log_green "$(date) INFO: $wav_count wav files waiting in $ingest_dir, $srv state is $service_state, $srv2 state is $analysis_state"
-
-    # Pause recorder if queue is too large
-    if ((wav_count > 50)); then
-        log_red "$(date) WARNING: Too many files in queue, pausing $srv and restarting $srv2"
-        apprisealert "Too many files in queue (>50), $srv paused, $srv2 restarted"
-        sudo systemctl stop "$srv"
-        sudo systemctl restart "$srv2"
-    elif ((wav_count > 30)); then
-        log_red "$(date) WARNING: Too many files in queue, $srv2 restarted"
-        apprisealert "Queue growing large (>30)"
-        sudo systemctl restart "$srv2"
-    else
-        # Check service states
-        for service in "$srv" "$srv2"; do
-            state="$(systemctl is-active "$service")"
-            if [[ "$state" != "active" ]]; then
-                log_yellow "$(date) INFO: Restarting $service service"
-                sudo systemctl restart "$service"
-                sleep 5
-                state="$(systemctl is-active "$service")"
-                if [[ "$state" != "active" ]]; then
-                    log_red "$(date) WARNING: $service could not restart"
-                    apprisealert "$service cannot restart"
-                fi
-            fi
-        done
+    if (( same_file_counter >= SAME_FILE_THRESHOLD )); then
+        log_yellow "$(date) WARNING: 'analyzing_now' unchanged for ${SAME_FILE_THRESHOLD} iterations, restarting services"
+        apprisealert "No change in analyzing_now for ${SAME_FILE_THRESHOLD} iterations"
+        "$HOME/BirdNET-Pi/scripts/restart_services.sh"
+        same_file_counter=0
     fi
-    ((counter--))
+
+    # Count the number of .wav files in the ingest directory.
+    wav_count=$(find -L "$INGEST_DIR" -maxdepth 1 -name '*.wav' | wc -l)
+    log_green "$(date) INFO: ${wav_count} wav files waiting in ${INGEST_DIR}"
+
+    # Handle queue size conditions and service health.
+    handle_queue "$wav_count"
+
 done