diff --git a/vpnmon.sh b/vpnmon.sh
index 2c98bbb..70561a9 100755
--- a/vpnmon.sh
+++ b/vpnmon.sh
@@ -12,23 +12,24 @@ START(){
 	
 	sudo mkdir -p /var/run/xl2tpd
 	sudo touch /var/run/xl2tpd/l2tp-control
-	sudo service strongswan restart
+	[ "$(systemctl list-units --full -all | grep "strongswan.service")" != "" ] && sudo service strongswan restart
+	[ "$(systemctl list-units --full -all | grep "strongswan-starter.service")" != "" ] && sudo service strongswan-starter restart
 	sudo service xl2tpd restart
 	sudo service ipsec restart
 	sleep 8s
-	sudo /usr/sbin/ipsec up L2TP-PSK
+	sudo /usr/sbin/ipsec up ${VPN_NAME}
 	sleep 8s
-	sudo bash -c 'echo "c myVPN" > /var/run/xl2tpd/l2tp-control'
+	sudo bash -c 'echo "c ${VPN_NAME}" > /var/run/xl2tpd/l2tp-control'
 	sleep 8s
 	
-	[ "${ROUTE}" != "" ] && ip route add ${ROUTE} via $(ip address show dev ppp0 | grep -Po '(?<=peer )(\b([0-9]{1,3}\.){3}[0-9]{1,3}\b)') dev ppp0
-	[ "${ROUTE2}" != "" ] && ip route add ${ROUTE2} via $(ip address show dev ppp0 | grep -Po '(?<=peer )(\b([0-9]{1,3}\.){3}[0-9]{1,3}\b)') dev ppp0
+	[ "${ROUTE_SUBNET1}" != "" ] && ip route add ${ROUTE_SUBNET1} via $(ip address show dev ppp0 | grep -Po '(?<=peer )(\b([0-9]{1,3}\.){3}[0-9]{1,3}\b)') dev ppp0
+	[ "${ROUTE_SUBNET2}" != "" ] && ip route add ${ROUTE_SUBNET2} via $(ip address show dev ppp0 | grep -Po '(?<=peer )(\b([0-9]{1,3}\.){3}[0-9]{1,3}\b)') dev ppp0
 		
-	if [ "${SYSTEM}" = "unifipoller" ]; then
-		/usr/sbin/service unifi-poller start &
-		#elif [ "${SYSTEM}" = "rpicam" ]; then
-		#/usr/sbin/service rpisurv restart
-	fi
+	# if [ "${SYSTEM}" = "unifipoller" ]; then
+	# 	/usr/sbin/service unifi-poller start &
+	# elif [ "${SYSTEM}" = "rpicam" ]; then
+	# 	/usr/sbin/service rpisurv restart
+	# fi
 	
 	rm -f /opt/idssys/vpnmon/vpn.stop
 	
@@ -39,12 +40,12 @@ STOP(){
 	
 	touch /opt/idssys/vpnmon/vpn.stop
 	
-	if [ "${SYSTEM}" = "unifipoller" ]; then
-		/usr/sbin/service unifi-poller stop
-	fi
+	# if [ "${SYSTEM}" = "unifipoller" ]; then
+	# 	/usr/sbin/service unifi-poller stop
+	# fi
 	
-	sudo bash -c 'echo "d myVPN" > /var/run/xl2tpd/l2tp-control'
-	/usr/sbin/ipsec down L2TP-PSK
+	sudo bash -c 'echo "d ${VPN_NAME}" > /var/run/xl2tpd/l2tp-control'
+	/usr/sbin/ipsec down ${VPN_NAME}
 	
 	echo "$(date) - VPN stopped" >> $logfile