diff --git a/tracker-add-auto.sh b/tracker-add-auto.sh
index e501097..c682b79 100644
--- a/tracker-add-auto.sh
+++ b/tracker-add-auto.sh
@@ -1,48 +1,63 @@
 #!/bin/bash
 
-while true ; do
-sleep ${INTERVAL:-25}
-add_trackers () {
+while true; do
+  sleep ${INTERVAL:-25}
+
+  add_trackers() {
     torrent_hash=$1
     id=$2
-for base_url in "$TORRENTLIST" ; do
-if [ ! -f /tmp/trackers.txt ]; then
-curl -o "/tmp/trackers.txt" "${base_url}"
-fi
-Local=$(wc -c < /tmp/trackers.txt)
-Remote=$(curl -sI "${base_url}" | awk '/Content-Length/ {sub("\r",""); print $2}')
-if [ $Local != $Remote ]; then
-curl -o "/tmp/trackers.txt" "${base_url}"
-fi
-    echo "URL for ${base_url}"
-    echo "Adding trackers for $torrent_name..."
-for tracker in $(cat /tmp/trackers.txt) ; do
-    echo -n "${tracker}..."
-if transmission-remote "$HOSTPORT"  --authenv --torrent "${torrent_hash}" -td "${tracker}" | grep -q 'success'; then
-    echo ' failed.'
-else
-    echo ' done.'
-fi
-done
-done
+    for base_url in "$TORRENTLIST"; do
+      if [ ! -f /tmp/trackers.txt ]; then
+        curl -o "/tmp/trackers.txt" "${base_url}"
+
+        if [ -f /opt/trackers.txt ]; then
+          cat /opt/trackers.txt >>/tmp/trackers.txt
+        fi
+      fi
+
+      Local=$(wc -c </tmp/trackers.txt)
+      Remote=$(curl -sI "${base_url}" | awk '/Content-Length/ {sub("\r",""); print $2}')
+
+      if [ $Local != $Remote ]; then
+        curl -o "/tmp/trackers.txt" "${base_url}"
+
+        if [ -f /opt/trackers.txt ]; then
+          cat /opt/trackers.txt >>/tmp/trackers.txt
+        fi
+      fi
+
+      echo "URL for ${base_url}"
+      echo "Adding trackers for $torrent_name..."
+
+      for tracker in $(cat /tmp/trackers.txt); do
+        echo -n "${tracker}..."
+        if transmission-remote "$HOSTPORT" --authenv --torrent "${torrent_hash}" -td "${tracker}" | grep -q 'success'; then
+          echo ' failed.'
+        else
+          echo ' done.'
+        fi
+      done
+    done
+
     sleep 3m
     rm -f /tmp/TTAA.$id.lock
-}
-# Get list of active torrents
-    ids="$(transmission-remote "$HOSTPORT" --authenv --list | grep -vE 'Seeding|Stopped|Finished|[[:space:]]100%[[:space:]]' | grep '^ ' | awk '{ print $1 }')"
-for id in $ids ; do
-    add_date="$(transmission-remote "$HOSTPORT" --authenv --torrent "$id" --info| grep '^  Date added: ' |cut -c 21-)"
+  }
+
+  # Get list of active torrents
+  ids="$(transmission-remote "$HOSTPORT" --authenv --list | grep -vE 'Seeding|Stopped|Finished|[[:space:]]100%[[:space:]]' | grep '^ ' | awk '{ print $1 }')"
+  for id in $ids; do
+    add_date="$(transmission-remote "$HOSTPORT" --authenv --torrent "$id" --info | grep '^  Date added: ' | cut -c 21-)"
     add_date_t="$(date -d "$add_date" "+%Y-%m-%d %H:%M")"
     dater="$(date "+%Y-%m-%d %H:%M")"
     dateo="$(date -d "1 minutes ago" "+%Y-%m-%d %H:%M")"
 
-if [ ! -f /tmp/TTAA.$id.lock ]; then
-if [[ ( "$add_date_t" == "$dater" || "$add_date_t" == "$dateo" ) ]]; then
-    hash="$(transmission-remote "$HOSTPORT" --authenv --torrent "$id" --info | grep '^  Hash: ' | awk '{ print $2 }')"
-    torrent_name="$(transmission-remote "$HOSTPORT" --authenv --torrent "$id" --info | grep '^  Name: ' |cut -c 9-)"
-    add_trackers "$hash" "$id" &
-    touch /tmp/TTAA.$id.lock
-fi
-fi
-done
+    if [ ! -f /tmp/TTAA.$id.lock ]; then
+      if [[ ("$add_date_t" == "$dater" || "$add_date_t" == "$dateo") ]]; then
+        hash="$(transmission-remote "$HOSTPORT" --authenv --torrent "$id" --info | grep '^  Hash: ' | awk '{ print $2 }')"
+        torrent_name="$(transmission-remote "$HOSTPORT" --authenv --torrent "$id" --info | grep '^  Name: ' | cut -c 9-)"
+        add_trackers "$hash" "$id" &
+        touch /tmp/TTAA.$id.lock
+      fi
+    fi
+  done
 done