diff --git a/autoProcess/autoProcessMovie.py b/autoProcess/autoProcessMovie.py
index fce9c074..e3b97d93 100644
--- a/autoProcess/autoProcessMovie.py
+++ b/autoProcess/autoProcessMovie.py
@@ -311,6 +311,8 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
         url = baseURL + "movie.searcher.try_next/?id=" + movie_id
 
         Logger.debug("Opening URL: %s", url)
+        TimeOut2 = wait_for * 60 # If transfering files across directories, it now appears CouchPotato can take a while to confirm this url request... Try using wait_for timing.
+        socket.setdefaulttimeout(int(TimeOut2)) #initialize socket timeout. We may now be able to remove the delays from the wait_for section below?
 
         try:
             urlObj = urllib.urlopen(url)
@@ -331,12 +333,13 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
                 Logger.exception("Unable to delete folder %s", dirName)
         return 0 # success
     
-    if nzbName == "Manual Run":
+    if nzbName == "Manual Run" or download_id == "none":
         return 0 # success
 
     # we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing.
+    socket.setdefaulttimeout(int(TimeOut)) #initialize socket timeout.
     start = datetime.datetime.now()  # set time for timeout
-    pause_for = wait_for * 10 # keep this so we only ever have 6 complete loops.
+    pause_for = wait_for * 10 # keep this so we only ever have 6 complete loops. This may not be necessary now?
     while (datetime.datetime.now() - start) < datetime.timedelta(minutes=wait_for):  # only wait 2 (default) minutes, then return.
         movie_status, clientAgent, download_id, release_status = get_status(baseURL, movie_id, clientAgent, download_id) # get the current status fo this movie.
         if movie_status != initial_status:  # Something has changed. CPS must have processed this movie.
diff --git a/changelog.txt b/changelog.txt
index e8986590..c44d9678 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,11 @@
 Change_LOG / History
 
+V9.1 XX/01/2014
+
+Impacts All
+Don't wait to verify status change in CouchPotato when no initial status (manual run)
+Now use "wait_for" timing as socket timeout on the renamer.scan. It appears to now be delayed in confirming success.
+
 V9.0 19/01/2014
 
 Impacts NZBs