diff --git a/modules/distribution/src/sketches/firealarm/startservice.sh b/modules/distribution/src/sketches/firealarm/startservice.sh
index 086f0d2d..829e8e62 100755
--- a/modules/distribution/src/sketches/firealarm/startservice.sh
+++ b/modules/distribution/src/sketches/firealarm/startservice.sh
@@ -7,76 +7,107 @@ echo "|	       ----------------				"
 echo "|    ....initializing startup-script	"
 echo "----------------------------------------------------------------"
 
-while true; do
-    read -p "Do you wish to run 'apt-get update' and continue? [Yes/No] " yn
-    case $yn in
-        [Yy]* ) sudo apt-get update;
-				break;;
-        [Nn]* ) echo "Continuing without apt-get update...";
-				break;;
-        * ) echo "Please answer yes or no.";
-    esac
+#while true; do
+#    read -p "Do you wish to run 'apt-get update' and continue? [Yes/No] " yn
+#    case $yn in
+#        [Yy]* ) sudo apt-get update;
+#				break;;
+#        [Nn]* ) echo "Continuing without apt-get update...";
+#				break;;
+#        * ) echo "Please answer yes or no.";
+#    esac
+#done
+#
+#if [ $? -ne 0 ]; then
+#    echo "apt-get update failed.... Some dependencies may not get installed"
+#    echo "If an already installed version of the package exists, try running:"
+#    echo "----------------------------------------------------------------"
+#    echo "sudo -i"
+#    echo "cd /var/lib/dpkg/info"
+#    echo "rm -rf wso2-raspi-alarm*"
+#    echo "dpkg --remove --force-remove-reinstreq wso2-raspi-alarm"
+#    echo "exit"
+#    echo "----------------------------------------------------------------"
+#    echo "Retry Installation...."
+#    break;
+#fi
+#
+#echo "Installing 'gdebi' package..."
+#sudo apt-get install gdebi			# installation of gdebi
+#
+#
+#if [ $? -ne 0 ]; then
+#	echo "gdebi installation failed.... dependencies will not be installed without gdebi"
+#	read -p "Do you wish to continue without gdebi? [Yes/No] " yn
+#    case $yn in
+#        [Yy]* ) echo "Continueing without gdebi.....";;
+#        [Nn]* ) echo "Try to resolve errors and re-run the script.";
+#				exit;;
+#        * ) exit;;
+#    esac
+#fi
+#
+#
+#for f in ./wso2-raspi-alarm_1.0_armhf.deb; do
+#    ## Check if the glob gets expanded to existing files.
+#    ## If not, f here will be exactly the pattern above
+#    ## and the exists test will evaluate to false.
+#    # [ -e "$f" ] && echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing" || echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path"; exit;
+#    if [ -e "$f" ]; then
+#    	echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing now...."
+#    else
+#    	echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path. \nExiting installation...";
+#    	exit;
+#    fi
+#    ## This is all we needed to know, so we can break after the first iteration
+#    break
+#done
+#
+#echo "Installing the 'wso2-raspi-alarm deb package'"
+#sudo gdebi wso2-raspi-alarm_1.0_armhf.deb
+#
+#if [ $? -ne 0 ]; then
+#	echo "Installation Failed...."
+#	exit;
+#fi
+
+sudo killall -9 python
+
+for f in ./RaspberryAgent.zip; do
+    ## Check if the glob gets expanded to existing files.
+    ## If not, f here will be exactly the pattern above
+    ## and the exists test will evaluate to false.
+    # [ -e "$f" ] && echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing" || echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path"; exit;
+    if [ -e "$f" ]; then
+    	echo "Agent files found......"
+	sudo rm -rf /usr/local/src/RaspberryAgent
+	sudo unzip RaspberryAgent.zip -d /usr/local/src/
+    else
+    	echo "'RaspberryAgent.zip' file does not exist in current path. \nInstalling without upgrading agent..."; 
+     fi
+    ## This is all we needed to know, so we can break after the first iteration
+    break
 done
 
-if [ $? -ne 0 ]; then
-    echo "apt-get update failed.... Some dependencies may not get installed"
-    echo "If an already installed version of the package exists, try running:"
-    echo "----------------------------------------------------------------"
-    echo "sudo -i"
-    echo "cd /var/lib/dpkg/info"
-    echo "rm -rf wso2-raspi-alarm*"
-    echo "dpkg --remove --force-remove-reinstreq wso2-raspi-alarm"
-    echo "exit"
-    echo "----------------------------------------------------------------"
-    echo "Retry Installation...."
-    break;
-fi
-
-echo "Installing 'gdebi' package..."
-sudo apt-get install gdebi			# installation of gdebi
-
-
-if [ $? -ne 0 ]; then
-	echo "gdebi installation failed.... dependencies will not be installed without gdebi"
-	read -p "Do you wish to continue without gdebi? [Yes/No] " yn
-    case $yn in
-        [Yy]* ) echo "Continueing without gdebi.....";;
-        [Nn]* ) echo "Try to resolve errors and re-run the script.";
-				exit;;
-        * ) exit;;
-    esac
-fi
-
-
-for f in ./wso2-raspi-alarm_1.0_armhf.deb; do
+for f in /usr/local/src/RaspberryAgent/rc.local; do
     ## Check if the glob gets expanded to existing files.
     ## If not, f here will be exactly the pattern above
     ## and the exists test will evaluate to false.
-    # [ -e "$f" ] && echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing" || echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path"; exit;
     if [ -e "$f" ]; then
-    	echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing now...."
+    	echo "Copying boot script"
+	sudo mv /usr/local/src/RaspberryAgent/rc.local /etc/rc.local
+	sudo chmod +x /etc/rc.local
     else
-    	echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path. \nExiting installation..."; 
-    	exit;
+    	echo "Unable to set agent statup on boot"; 
     fi
     ## This is all we needed to know, so we can break after the first iteration
     break
 done
 
-echo "Installing the 'wso2-raspi-alarm deb package'"
-sudo gdebi wso2-raspi-alarm_1.0_armhf.deb
-
-if [ $? -ne 0 ]; then
-	echo "Installation Failed...."
-	exit;
-fi
-
-
 for f in ./deviceConfigs.cfg; do
     ## Check if the glob gets expanded to existing files.
     ## If not, f here will be exactly the pattern above
     ## and the exists test will evaluate to false.
-    # [ -e "$f" ] && echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing" || echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path"; exit;
     if [ -e "$f" ]; then
     	echo "Configuration file found......"
     else
@@ -87,6 +118,9 @@ for f in ./deviceConfigs.cfg; do
     break
 done
 
+echo "Altering Configuration file"
+sed -i 's|[/,]||g' deviceConfigs.cfg
+
 echo "Copying configurations file to /usr/local/src/RaspberryAgent"
 sudo cp ./deviceConfigs.cfg /usr/local/src/RaspberryAgent/
 
@@ -95,15 +129,13 @@ if [ $? -ne 0 ]; then
 	exit;
 fi
 
-echo "Running the RaspberryAgent service...."
-# sudo service RaspberryService.sh start
-
 while true; do
     read -p "Whats the time-interval (in seconds) between successive Data-Pushes to the WSO2-DC (ex: '60' indicates 1 minute) > " input
 
     if [ $input -eq $input 2>/dev/null ]
     then
         echo "Setting data-push interval to $input seconds."
+        echo $input > /usr/local/src/RaspberryAgent/time-interval
         break;
     else
         echo "Input needs to be an integer indicating the number seconds between successive data-pushes."
@@ -112,19 +144,24 @@ done
 
 
 cd /usr/local/src/RaspberryAgent/
-sudo nohup ./RaspberryStats.py -i $input > /dev/null 2>&1 &
+sudo chmod +x RaspberryStats.py
+sudo nohup ./RaspberryStats.py -i $input < /dev/null &
 
 if [ $? -ne 0 ]; then
 	echo "Could not start the service..."
 	exit;
+else
+	echo "Running the RaspberryAgent service...."
 fi
 
 
 echo "--------------------------------------------------------------------------"
 echo "|			Successfully Started		"
 echo "|		   --------------------------		"
-#echo "|	 run 'sudo service RaspberryService.sh status'	to check status"
-#echo "|	 run 'sudo service RaspberryService.sh stop'	to stop service"
+echo "|  cd to /usr/local/src/RaspberryAgent"
+echo "|	 run 'sudo nohup ./RaspberryStats.py -i time > /dev/null 2>&1 &'to start service manually."
+echo "|  Relapce time with the time-interval (in seconds) between successive Data-Pushes to the WSO2-DC (ex: '60' indicates 1 minute)"
 #echo "|		   --------------------------		"
 echo "|	 Find logs at: /usr/local/src/RaspberryAgent/logs/RaspberryStats.log"
 echo "---------------------------------------------------------------------------"
+