Index: scripts/start.sh
===================================================================
diff -u -r3e5d7dc83d85c4727634d366938b40d20cfebc4e -r4717608b04a56847fcc274150078fccafa5a86d3
--- scripts/start.sh	(.../start.sh)	(revision 3e5d7dc83d85c4727634d366938b40d20cfebc4e)
+++ scripts/start.sh	(.../start.sh)	(revision 4717608b04a56847fcc274150078fccafa5a86d3)
@@ -23,8 +23,8 @@
 DEMO_SETUP=0
 DEMO_SWITCH="-D"
 
-UPDATE_SETUP=0
-UPDATE_SWITCH="-U"          #Update only setup
+MANUFACTURING_SETUP=0
+MANUFACTURING_SWITCH="-E"          #Update only setup
 
 SERVER_IP="" # $CloudSync_DRT_SERVER_IP
 SERVER_WS=""
@@ -54,8 +54,8 @@
       "$DEMO_SWITCH")
         DEMO_SETUP=1
       ;;
-      "$UPDATE_SWITCH")
-        UPDATE_SETUP=1
+      "$MANUFACTURING_SWITCH")
+        MANUFACTURING_SETUP=1
       ;;
       "$SERVER_SWITCH_DRT_IP"*)
         SERVER_IP="${arg:2}"
@@ -77,11 +77,12 @@
   echo "Device IP Address     : $DST_IP"
 
   # if it is the update only we don't need the configuration
-  if (( $UPDATE_SETUP )); then
+  if (( $MANUFACTURING_SETUP )); then
+    echo "Device setup Mode     : Manufacturing Setup"
+  else
     echo "Device setup Mode     : Update Only"
     return
   fi
-  echo "Device setup Mode     : Manufacturing Setup"
   
   getServerIP
   echo "DRT Server IP Address : $SERVER_IP"
@@ -119,9 +120,10 @@
     echo "            Demo mode mode can be used to use the device as a demo unit."
     echo "            In this mode Application will not work with the actual hardware and will work in simulation mode."
     echo "            The Demo application folder need to be copied to the update folder manually."
-    echo "-U        : Update mode"
-    echo "            Update mode can only be used when the device is already registered,"
-    echo "            Therefore the -S and -W will be ignored."
+    echo "-E        : Manufacturing setup mode"
+    echo "            The Manufacturing setup will wipe device configuration, setup, registration,"
+    echo "            and nees a fresh configuration, and device registration on the cloud,"
+    echo "            therefore the -S and -W is mandatory."
     echo "-S        : The DRT Server IP address"
     echo "            Need to be entered fully in a valid IP format [xxx.xxx.xxx.xxx]"
     echo "            There should be no space between -S and the server IP address"
@@ -235,7 +237,7 @@
 }
 
 function manufacturingModePrompt() {
-    if (( $UPDATE_SETUP )); then return; fi
+    if (( $MANUFACTURING_SETUP )); then : else return; fi
 
     echo_star_comment
     echo_star_message "Do you want to run in the Manufacturing Mode?"