diff --git a/botthread.c b/botthread.c
index 7adbde4..1ff2824 100644
--- a/botthread.c
+++ b/botthread.c
@@ -400,8 +400,9 @@
       if (tmpChans->modes[CHAN_SCHEDULED] == 0x1)
         goto gotUser;
       
-      if (tmpChans->modes[CHAN_QUEUE] == 0x0) /* If Channel Has Queues Disabled Jump Right To Random */
-        goto getRandom;
+
+      //if (tmpChans->modes[CHAN_QUEUE] == 0x0) /* If Channel Has Queues Disabled Jump Right To Random */
+      //  goto getRandom;
         
       if (tmpChans->count == MAX_COUNT) {
       	lC = 0;
@@ -420,15 +421,17 @@
           
           if (tmpChans->nextUser == 0x0)
             goto sE;
-            
-          if (tmpChans->nextUser->user->userInfo.queue == 0x1)
-            goto gotUser;
+
+          if (((tmpChans->modes[CHAN_QUEUE] == 0x0) && (tmpChans->nextUser->chanLevel >= 1)) || (tmpChans->modes[CHAN_QUEUE] == 0x1)) 
+            if (tmpChans->nextUser->user->userInfo.queue == 0x1)
+              goto gotUser;
           
           lC++;
           }
         }
       else if (tmpChans->nextUser != 0x0)    
-        goto gotUser;
+          goto gotUser;
+
 
       /* Find A Random Song */
       getRandom:
@@ -471,9 +474,15 @@
         
       gotUser:
       if (tmpChans->nextUser->user->userInfo.queue == 0x1) {
-        sSendData(tmpChans->nextUser->user,"GETVIDEO");
-        writeLog(0,"Need To Find Next Song For: %s, From User: %s\n",tmpChans->channel,tmpChans->nextUser->user->userInfo.username);
-        tmpChans->count++;
+        if (((tmpChans->modes[CHAN_QUEUE] == 0x0) && (tmpChans->nextUser->chanLevel >= 1)) || (tmpChans->modes[CHAN_QUEUE] == 0x1)) {
+          sSendData(tmpChans->nextUser->user,"GETVIDEO");
+          writeLog(0,"Need To Find Next Song For: %s, From User: %s\n",tmpChans->channel,tmpChans->nextUser->user->userInfo.username);
+          tmpChans->count++;
+          }
+        else if (tmpChans->modes[CHAN_SCHEDULED] == 0) {
+          tmpChans->count = MAX_COUNT;
+          goto findUser;
+          }
         }
       else if (tmpChans->modes[CHAN_SCHEDULED] == 0) {
         tmpChans->count = MAX_COUNT;