diff --git a/mm-scripts.sh b/mm-scripts.sh
index d7a941c..1985415 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -76,37 +76,7 @@ MMSTART(){
 			c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
 			until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 			echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}"
-			
-			privkey=$(/usr/bin/wg genkey)
-			reqpublickey=$(echo "${privkey}" | /usr/bin/wg pubkey)
-			reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")"
-			
-			rm -f ${MMFOLDER}/vpninfo
-			JSON=$(curl https://${VPN_SERVER}:1443/api/v1/setup?public-key=${reqpublickey} --user "${VPN_USER}:${VPN_PASS}" -sk)			
-			echo -e "vpn_publickey=\"$(echo ${JSON} | jq -r '.server_public_key')\"
-vpn_server_ipv4=\"$(echo ${JSON} | jq -r '.server_ipv4')\"
-vpn_client_ipv4=\"$(echo ${JSON} | jq -r '.client_ipv4')\"
-vpn_routes=\"$(echo ${JSON} | jq -r '.routes')\"
-vpn_server_address=\"$(echo ${JSON} | jq -r '.vpn_server_address')\"
-vpn_server_port=\"$(echo ${JSON} | jq -r '.vpn_server_port')\"
-" > ${MMFOLDER}/vpninfo
-			source ${MMFOLDER}/vpninfo
-
-			rm -f /etc/wireguard/${VPN_INTERFACE}.conf
-
-			echo -e "[Interface]
-PrivateKey = ${privkey}
-ListenPort = 55009
-MTU = 1390
-DNS = 1.1.1.1
-Address = ${vpn_client_ipv4}
-
-[Peer]
-PublicKey = ${vpn_publickey}
-AllowedIPs = 0.0.0.0/0
-Endpoint = ${vpn_server_address}:${vpn_server_port}
-PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf
-
+			VPNCONFIG
 			echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 			
 			msg="Starting the VPN Tunnel"
@@ -718,6 +688,38 @@ GETVPNINFO(){
 
 }
 
+VPNCONFIG(){
+			privkey=$(/usr/bin/wg genkey)
+			reqpublickey=$(echo "${privkey}" | /usr/bin/wg pubkey)
+			reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")"
+			
+			rm -f ${MMFOLDER}/vpninfo
+			JSON=$(curl https://${VPN_SERVER}:1443/api/v1/setup?public-key=${reqpublickey} --user "${VPN_USER}:${VPN_PASS}" -sk)			
+			echo -e "vpn_publickey=\"$(echo ${JSON} | jq -r '.server_public_key')\"
+vpn_server_ipv4=\"$(echo ${JSON} | jq -r '.server_ipv4')\"
+vpn_client_ipv4=\"$(echo ${JSON} | jq -r '.client_ipv4')\"
+vpn_routes=\"$(echo ${JSON} | jq -r '.routes')\"
+vpn_server_address=\"$(echo ${JSON} | jq -r '.vpn_server_address')\"
+vpn_server_port=\"$(echo ${JSON} | jq -r '.vpn_server_port')\"
+" > ${MMFOLDER}/vpninfo
+			source ${MMFOLDER}/vpninfo
+
+			rm -f /etc/wireguard/${VPN_INTERFACE}.conf
+
+			echo -e "[Interface]
+PrivateKey = ${privkey}
+ListenPort = 55009
+MTU = 1390
+DNS = 1.1.1.1
+Address = ${vpn_client_ipv4}
+
+[Peer]
+PublicKey = ${vpn_publickey}
+AllowedIPs = 0.0.0.0/0
+Endpoint = ${vpn_server_address}:${vpn_server_port}
+PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf
+}
+
 VPNSPEEDTEST(){
 	echo -e "${idsCL[Green]}VPN Speedtest Comparison${idsCL[Default]}"
 	DIVIDER . lightGreen
@@ -744,6 +746,7 @@ VPNSPEEDTEST(){
 	sleep 5s
 	
 	echo -en "${idsCL[LightCyan]}Starting vpn ... ${idsCL[Default]}"
+	VPNCONFIG
 	"${VPN_START[@]}" >/dev/null 2>&1
 	echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 	echo