diff --git a/etc/daq-web-service.conf.template b/etc/daq-web-service.conf.template
index 0a6ea49dce549f6d179e74d1a6ebc9a72957adea..b3206abd6a1ebac7cda6a8009072f040fedd1c2d 100644
--- a/etc/daq-web-service.conf.template
+++ b/etc/daq-web-service.conf.template
@@ -19,13 +19,14 @@ principalAuthenticator2=LdapPasswordPrincipalAuthenticator(serverUrl='ldaps://ph
 
 [FileSystemObserver]
 # Minimum file processing delay since last update
-minFileProcessingDelayInSeconds=10
+minFileProcessingDelayInSeconds=30
 fileSystemEventTimeoutInSeconds=10
-fileSystemObserverAgent=dm.daq_web_service.service.impl.watchdogFileSystemObserverAgent.WatchdogFileSystemObserverAgent()
+#fileSystemObserverAgent=dm.daq_web_service.service.impl.watchdogFileSystemObserverAgent.WatchdogFileSystemObserverAgent()
 #fileSystemObserverAgent=dm.daq_web_service.service.impl.ftpFileSystemObserverAgent.FtpFileSystemObserverAgent('dmdaq', 2811)
+fileSystemObserverAgent=dm.daq_web_service.service.impl.pollingFileSystemObserverAgent.PollingFileSystemObserverAgent(pollingPeriod=30)
 
 [FileProcessingManager]
-numberOfProcessingThreads=5
+numberOfProcessingThreads=10
 defaultNumberOfRetries=1
 defaultRetryWaitPeriodInSeconds=60
 statUtility=dm.common.utility.fileUtility.FileUtility()
diff --git a/sbin/11IDB/dm_11idb_system_test_daq.sh b/sbin/11IDB/dm_11idb_system_test_daq.sh
index 04e2b5fe71bc271869cf81308f4e6a1ed934eb90..664d6cb6d18f8c56cf630b1e8d46127d0a7096ad 100755
--- a/sbin/11IDB/dm_11idb_system_test_daq.sh
+++ b/sbin/11IDB/dm_11idb_system_test_daq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 cd `dirname $0`/.. && DM_SBIN_DIR=`pwd`
-$DM_SBIN_DIR/dm_system_test_daq.sh /gdata/dm/test/11IDB dtn-int-01:/gdata/dm/test/11IDB
+$DM_SBIN_DIR/dm_system_test_daq.sh /home/dm_idb/test
 
 
diff --git a/sbin/11IDB/dm_11idb_system_test_upload.sh b/sbin/11IDB/dm_11idb_system_test_upload.sh
index b8b4b58338b10da9d25e34d23036973673b9da70..af73933125fc04464d128438bce0cddb2033fe31 100755
--- a/sbin/11IDB/dm_11idb_system_test_upload.sh
+++ b/sbin/11IDB/dm_11idb_system_test_upload.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 cd `dirname $0`/.. && DM_SBIN_DIR=`pwd`
-$DM_SBIN_DIR/dm_system_test_upload.sh /gdata/dm/test/11IDB dtn-int-01:/gdata/dm/test/11IDB
+$DM_SBIN_DIR/dm_system_test_upload.sh /home/dm_idb/test
 
 
diff --git a/sbin/11IDC/dm_11idc_system_test_daq.sh b/sbin/11IDC/dm_11idc_system_test_daq.sh
index b3ab1a4aebdcad38e53c98922ac6927d5dff05ba..f36c5d7e62b9dd2b28a2e6945393caf7066a1b75 100755
--- a/sbin/11IDC/dm_11idc_system_test_daq.sh
+++ b/sbin/11IDC/dm_11idc_system_test_daq.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 cd `dirname $0`/.. && DM_SBIN_DIR=`pwd`
-$DM_SBIN_DIR/dm_system_test_daq.sh /gdata/dm/test/11IDC dtn-int-01:/gdata/dm/test/11IDC
+$DM_SBIN_DIR/dm_system_test_daq.sh /home/dm_idc/test
 
diff --git a/sbin/11IDC/dm_11idc_system_test_upload.sh b/sbin/11IDC/dm_11idc_system_test_upload.sh
index 9e0462930b2a568ef0be5bd55516ce100b74971d..5ddcd19b7aab3fa0d033f57e76f8254b4ad3a3ed 100755
--- a/sbin/11IDC/dm_11idc_system_test_upload.sh
+++ b/sbin/11IDC/dm_11idc_system_test_upload.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 cd `dirname $0`/.. && DM_SBIN_DIR=`pwd`
-$DM_SBIN_DIR/dm_system_test_upload.sh /gdata/dm/test/11IDC dtn-int-01:/gdata/dm/test/11IDC
+$DM_SBIN_DIR/dm_system_test_upload.sh /home/dm_idc/test
 
diff --git a/sbin/17BM/dm_17bm_system_test_daq.sh b/sbin/17BM/dm_17bm_system_test_daq.sh
index 3454d6eb007a75ab1f70cc4060bbce5cf18669d9..7127a19a7ab246689148cf2471fae72774dd41f5 100755
--- a/sbin/17BM/dm_17bm_system_test_daq.sh
+++ b/sbin/17BM/dm_17bm_system_test_daq.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 cd `dirname $0`/.. && DM_SBIN_DIR=`pwd`
-$DM_SBIN_DIR/dm_system_test_daq.sh /gdata/dm/test/17BM dtn-int-01:/gdata/dm/test/17BM
+$DM_SBIN_DIR/dm_system_test_daq.sh /home/dm_bm/test
 
diff --git a/sbin/17BM/dm_17bm_system_test_upload.sh b/sbin/17BM/dm_17bm_system_test_upload.sh
index 0ce5a3b903bb7a1e0031ed2385f5552e339d52ce..467a9cdbdfe4713f6361a655c7702a6abedcac10 100755
--- a/sbin/17BM/dm_17bm_system_test_upload.sh
+++ b/sbin/17BM/dm_17bm_system_test_upload.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 cd `dirname $0`/.. && DM_SBIN_DIR=`pwd`
-$DM_SBIN_DIR/dm_system_test_upload.sh /gdata/dm/test/17BM dtn-int-01:/gdata/dm/test/17BM
+$DM_SBIN_DIR/dm_system_test_upload.sh /home/dm_bm/test
 
diff --git a/sbin/dm_remove_catalog_duplicates.sh b/sbin/dm_remove_catalog_duplicates.sh
index fbede229fd4d0874ea26eae54d76d278ee5c0c0d..572e17e108ecc227a689499178f41b152353e3ad 100755
--- a/sbin/dm_remove_catalog_duplicates.sh
+++ b/sbin/dm_remove_catalog_duplicates.sh
@@ -51,7 +51,7 @@ while read -r f; do
     f=`echo $f | sed 's/^[[:blank:]]*//;s/[[:blank:]]*$//'`
     echo "**********"
     echo "Working on file: \"$f\" ($fCount / $nUnique)"
-    dm-stat-file --experiment=$EXPERIMENT_NAME --relative-path=$f --md5sum > $STAT_FILE || exit 1
+    dm-stat-file --experiment=$EXPERIMENT_NAME --relative-path="$f" --md5sum > $STAT_FILE || exit 1
     fileSize=`cat $STAT_FILE | sed -e '1,/STAT INFO/d' | awk '{print $2}' | sed 's?fileSize=??'`
     md5Sum=`cat $STAT_FILE | sed -e '1,/STAT INFO/d' | awk '{print $3}' | sed 's?md5Sum=??'`
     echo "File size: $fileSize, md5Sum: $md5Sum"
@@ -71,12 +71,12 @@ while read -r f; do
             else
                 echo "File $id is marked as duplicate of $goodId"
                 echo "$f $id" >> $DUPLICATE_LIST_FILE
-                echo dm-delete-file --keep-in-storage --experiment=$EXPERIMENT_NAME --file-$id >> $DELETED_LIST_FILE
+                echo dm-delete-file --keep-in-storage --force --experiment=$EXPERIMENT_NAME --file-$id >> $DELETED_LIST_FILE
             fi
         else
             echo "Catalog info is not correct for $f, file size: $catFileSize, md5Sum: $catMd5Sum"
             echo "$f $id" >> $BAD_LIST_FILE
-            echo dm-delete-file --keep-in-storage --experiment=$EXPERIMENT_NAME --file-$id >> $DELETED_LIST_FILE
+            echo dm-delete-file --keep-in-storage --force --experiment=$EXPERIMENT_NAME --file-$id >> $DELETED_LIST_FILE
         fi
     done
 done < "$UNIQUE_LIST_FILE"
diff --git a/sbin/dm_station_upgrade_stage4.sh b/sbin/dm_station_upgrade_stage4.sh
index 9a2955b914394c65e77a8616df577de95da3c9ae..fb0f7c542400664228e89b278abce11895285551 100755
--- a/sbin/dm_station_upgrade_stage4.sh
+++ b/sbin/dm_station_upgrade_stage4.sh
@@ -38,7 +38,7 @@ if [ -f $DM_UPLOAD_LIST_FILE ]; then
     while IFS='' read -r line || [[ -n "$line" ]]; do
         uploadArgs=`echo $line | sed 's?experimentName?--experiment?' | sed 's?dataDirectory?--data-directory?'`
         echo "Restarting upload: $uploadArgs"
-        dm-upload $uploadArgs || exit 1
+        dm-upload $uploadArgs --reprocess || exit 1
     done < "$DM_UPLOAD_LIST_FILE"
 else
     echo "There is no uploads file: $DM_UPLOAD_LIST_FILE"
diff --git a/src/python/dm/common/objects/daqInfo.py b/src/python/dm/common/objects/daqInfo.py
index fe502676db20490d037b2ceec081e84ebce97a9f..6ef9e9d0e6942c70f685e4542522ff0b6e021476 100755
--- a/src/python/dm/common/objects/daqInfo.py
+++ b/src/python/dm/common/objects/daqInfo.py
@@ -114,11 +114,12 @@ class DaqInfo(DmObject):
         self['percentageProcessingErrors'] = '%.2f' % percentageProcessingErrors
 
         if self.get('endTime'):
-            daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FINALIZING
             if nCompletedFiles >= nFiles:
                 daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_DONE
                 if nProcessingErrors:
                     daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FAILED
+            else:
+                daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FAILED
             lastFileProcessingErrorTime = self.get('lastFileProcessingErrorTime')
             lastFileProcessedTime = self.get('lastFileProcessedTime')
             endTime = lastFileProcessedTime