diff --git a/install.sh b/install.sh
index b4b47e1..18b4060 100644
--- a/install.sh
+++ b/install.sh
@@ -262,9 +262,17 @@ cd /opt
 git clone https://github.com/Amateur-Digital-Network/ADN-DMR-Peer-Server.git
 cd ADN-DMR-Peer-Server
 sudo git checkout develop
-mkdir config
-mkdir /var/log/ADN
+if [ ! -d "/var/log/ADN" ]; then
+  mkdir /var/log/ADN
+fi
+if [ ! -d "/opt/ADN-DMR-Peer-Server/data" ]; then
+  mkdir /opt/ADN-DMR-Peer-Server/data
+fi
+if [ "$(ls -A "/opt/ADN-DMR-Peer-Server/data/")" ]; then
+  rm -rf "/opt/ADN-DMR-Peer-Server/data/"*
+fi
 sudo chmod -R +x /opt/ADN-DMR-Peer-Server/*
+sudo chmod -R 777 /opt/ADN-DMR-Peer-Server/*
 #./install.sh
 cp /opt/ADN-DMR-Peer-Server/config/ADN-SAMPLE.cfg /opt/ADN-DMR-Peer-Server/config/adn.cfg
 sed -i "s/SERVER_ID:.*/SERVER_ID: $variable/g"  /opt/ADN-DMR-Peer-Server/config/adn.cfg
@@ -537,8 +545,14 @@ sudo git clone https://gitlab.com/hp3icc/FDMR-Monitor2.git
 cd /opt/FDMR-Monitor2
 sudo git checkout Self_Service
 #sudo pip install -U -r requirements.txt
-chmod 755 /opt/FDMR-Monitor2/data
-
+if [ ! -d "/opt/FDMR-Monitor2/data" ]; then
+  mkdir /opt/FDMR-Monitor2/data
+fi
+if [ "$(ls -A "/opt/FDMR-Monitor2/data/")" ]; then
+  rm -rf "/opt/FDMR-Monitor2/data/"*
+fi
+sudo chmod -R 777 /opt/FDMR-Monitor2/*
+sudo chmod -R +x /opt/FDMR-Monitor2/*
 sudo chmod 644 /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg
 sed -i 's/RELOAD_TIME =.*/RELOAD_TIME = 1/' /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg
 sed -i 's/FREQUENCY =.*/FREQUENCY = 1/' /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg
diff --git a/update.sh b/update.sh
index 2da7c46..f63eecc 100644
--- a/update.sh
+++ b/update.sh
@@ -405,13 +405,17 @@ cd /opt
 git clone https://github.com/Amateur-Digital-Network/ADN-DMR-Peer-Server.git
 cd ADN-DMR-Peer-Server
 sudo git checkout develop
-chmod -R 777 /opt/ADN-DMR-Peer-Server/*
-chmod -R +x /opt/ADN-DMR-Peer-Server/*
-
-if [ ! -d "/var/log/ADN" ]
-then
-  mkdir -p /var/log/ADN
+if [ ! -d "/var/log/ADN" ]; then
+  mkdir /var/log/ADN
+fi
+if [ ! -d "/opt/ADN-DMR-Peer-Server/data" ]; then
+  mkdir /opt/ADN-DMR-Peer-Server/data
+fi
+if [ "$(ls -A "/opt/ADN-DMR-Peer-Server/data/")" ]; then
+  rm -rf "/opt/ADN-DMR-Peer-Server/data/"*
 fi
+sudo chmod -R +x /opt/ADN-DMR-Peer-Server/*
+sudo chmod -R 777 /opt/ADN-DMR-Peer-Server/*
 ####
 cp /opt/ADN-DMR-Peer-Server/config/ADN-SAMPLE.cfg  /opt/ADN-DMR-Peer-Server/config/adn.cfg
 sudo sed -i "s/SERVER_ID:.*/SERVER_ID: $variable/g"  /opt/ADN-DMR-Peer-Server/config/adn.cfg
@@ -442,8 +446,6 @@ sed -i "s/1234567/1234567,1231237,123123701/g" /opt/ADN-DMR-Peer-Server/proxy.cf
 #sed -i '228s/20/50/' /opt/ADN-DMR-Peer-Server/hotspot_proxy_v2.py
 #################
 
-sudo chmod +x /opt/ADN-DMR-Peer-Server/*.py
-#sudo chmod +x /opt/ADN-DMR-Peer-Server/config/*.py
 sh /opt/extra-1.sh
 sudo systemctl daemon-reload
 sudo systemctl start proxy.service
@@ -879,7 +881,12 @@ sudo git clone https://gitlab.com/hp3icc/FDMR-Monitor2.git
 cd /opt/FDMR-Monitor2
 sudo git checkout Self_Service
 #sudo pip install -U -r requirements.txt
-
+if [ ! -d "/opt/FDMR-Monitor2/data" ]; then
+  mkdir /opt/FDMR-Monitor2/data
+fi
+if [ "$(ls -A "/opt/FDMR-Monitor2/data/")" ]; then
+  rm -rf "/opt/FDMR-Monitor2/data/"*
+fi
 chmod -R 777 /opt/FDMR-Monitor2/*
 chmod -R +x /opt/FDMR-Monitor2/*