diff --git a/build.sdcard/raspbianStretchDesktop.sh b/build.sdcard/raspbianStretchDesktop.sh
index 2d6e25f2f..4b3c6ad0d 100644
--- a/build.sdcard/raspbianStretchDesktop.sh
+++ b/build.sdcard/raspbianStretchDesktop.sh
@@ -260,6 +260,10 @@ if [ ${#lndVersionCheck} -eq 0 ]; then
   echo "Sometimes it may just be a connection issue. Reset to fresh Rasbian and try again?"
   exit 1
 fi
+echo ""
+echo "** Link to /usr/local/bin ***"
+sudo ln -s /usr/local/gocode/bin/lncli /usr/local/bin/lncli
+sudo ln -s /usr/local/gocode/bin/lnd /usr/local/bin/lnd
 
 echo ""
 echo "*** RASPIBLITZ EXTRAS ***"
diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index 601e8ccb0..e143c0365 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -54,7 +54,7 @@ if [ "$USER" = "pi" ]; then
       elif [ ${setupStep} -lt 100 ]; then
 
         # setup process init is done and not finished
-        lndSyncing=$(sudo -u bitcoin /usr/local/gocode/bin/lncli getinfo 2>/dev/null | jq -r '.synced_to_chain' | grep -c false)
+        lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli getinfo 2>/dev/null | jq -r '.synced_to_chain' | grep -c false)
         chain=$(sudo -u bitcoin ${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo 2>/dev/null | jq -r '.chain')
         locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log 2>/dev/null | grep -c unlock)
 
diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index 5e35daf76..b633c380a 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -77,7 +77,7 @@ else
         lnchannels "Lightning Channel List")
 
       # Depending Options
-      openChannels=$(sudo -u bitcoin /usr/local/gocode/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
+      openChannels=$(sudo -u bitcoin /usr/local/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
       if [ ${openChannels} -gt 0 ]; then
         OPTIONS+=(CLOSEALL "Close all open Channels")  
       fi
diff --git a/home.admin/10setupBlitz.sh b/home.admin/10setupBlitz.sh
index 1395dcc89..e9451b1c3 100755
--- a/home.admin/10setupBlitz.sh
+++ b/home.admin/10setupBlitz.sh
@@ -26,7 +26,7 @@ if [ ${lndRunning} -eq 1 ]; then
 
   chain=$(${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo 2>/dev/null | jq -r '.chain')
   locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log 2>/dev/null | grep -c unlock)
-  lndSyncing=$(sudo -u bitcoin /usr/local/gocode/bin/lncli getinfo | jq -r '.synced_to_chain' 2>/dev/null | grep -c false)
+  lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli getinfo | jq -r '.synced_to_chain' 2>/dev/null | grep -c false)
   if [ ${locked} -gt 0 ]; then
     # LND wallet is locked
     ./AAunlockLND.sh
diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh
index 66ee7fd78..9cf3088cc 100755
--- a/home.admin/70initLND.sh
+++ b/home.admin/70initLND.sh
@@ -127,7 +127,7 @@ Press OK and follow the 'Helping Instructions'.
   
   # execute command and monitor error
   _error="./.error.out"
-  sudo -u bitcoin /usr/local/gocode/bin/lncli create 2>$_error
+  sudo -u bitcoin /usr/local/bin/lncli create 2>$_error
   error=`cat ${_error}`
 
   if [ ${#error} -gt 0 ]; then
@@ -200,7 +200,7 @@ fi
 echo ""
 echo "*** Check LND Sync ***"
 item=0
-lndSyncing=$(sudo -u bitcoin /usr/local/gocode/bin/lncli getinfo | jq -r '.synced_to_chain' | grep -c true)
+lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli getinfo | jq -r '.synced_to_chain' | grep -c true)
 if [ ${lndSyncing} -eq 0 ]; then
   echo "OK - wait for LND to be synced"
   while :
@@ -211,7 +211,7 @@ if [ ${lndSyncing} -eq 0 ]; then
       sleep 3
       
       # break loop when synced
-      lndSyncing=$(sudo -u bitcoin /usr/local/gocode/bin/lncli getinfo | jq -r '.synced_to_chain' | grep -c true)
+      lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli getinfo | jq -r '.synced_to_chain' | grep -c true)
       if [ ${lndSyncing} -eq 1 ]; then
         break
       fi
diff --git a/home.admin/95switchMainTest.sh b/home.admin/95switchMainTest.sh
index c4f18a592..733941bca 100755
--- a/home.admin/95switchMainTest.sh
+++ b/home.admin/95switchMainTest.sh
@@ -61,7 +61,7 @@ lndInstalled=$(systemctl status lnd.service | grep loaded -c)
 if [ ${lndInstalled} -gt 0 ]; then
 
   echo "check for open channels"
-  openChannels=$(sudo -u bitcoin /usr/local/gocode/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
+  openChannels=$(sudo -u bitcoin /usr/local/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
   if [ ${openChannels} -gt 0 ]; then
     echo ""
     echo "!!!!!!!!!!!!!!!!!!!"
diff --git a/home.admin/AAunlockLND.sh b/home.admin/AAunlockLND.sh
index a348ffff6..c09bb8552 100755
--- a/home.admin/AAunlockLND.sh
+++ b/home.admin/AAunlockLND.sh
@@ -12,7 +12,7 @@ echo "**************************************************************************
 while :
   do
     chain="$(${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo | jq -r '.chain')"
-    sudo -u bitcoin /usr/local/gocode/bin/lncli unlock
+    sudo -u bitcoin /usr/local/bin/lncli unlock
     sleep 4
     locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log | grep -c unlock)
     if [ ${locked} -eq 0  ]; then
diff --git a/home.admin/BBcloseAllChannels.sh b/home.admin/BBcloseAllChannels.sh
index d2bee0d85..882a17688 100755
--- a/home.admin/BBcloseAllChannels.sh
+++ b/home.admin/BBcloseAllChannels.sh
@@ -32,7 +32,7 @@ echo ""
 echo "OK"
 sleep 2
 
-openChannels=$(sudo -u bitcoin /usr/local/gocode/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
+openChannels=$(sudo -u bitcoin /usr/local/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
 if [ ${openChannels} -gt 0 ]; then
     echo ""
     echo "*******************"
diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh
index 0d6a5100c..a1eba2dd4 100755
--- a/home.admin/BBcreateInvoice.sh
+++ b/home.admin/BBcreateInvoice.sh
@@ -22,7 +22,7 @@ fi
 
 # check number of connected peers
 echo "check for open channels"
-openChannels=$(sudo -u bitcoin /usr/local/gocode/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
+openChannels=$(sudo -u bitcoin /usr/local/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
 if [ ${openChannels} -eq 0 ]; then
   echo ""
   echo "!!!!!!!!!!!!!!!!!!!"
diff --git a/home.admin/BBpayInvoice.sh b/home.admin/BBpayInvoice.sh
index addd3d587..2b1540c52 100755
--- a/home.admin/BBpayInvoice.sh
+++ b/home.admin/BBpayInvoice.sh
@@ -23,7 +23,7 @@ fi
 
 # check number of connected peers
 echo "check for open channels"
-openChannels=$(sudo -u bitcoin /usr/local/gocode/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
+openChannels=$(sudo -u bitcoin /usr/local/bin/lncli listchannels 2>/dev/null | grep chan_id -c)
 if [ ${openChannels} -eq 0 ]; then
   echo ""
   echo "!!!!!!!!!!!!!!!!!!!"
diff --git a/home.admin/assets/lnd.service b/home.admin/assets/lnd.service
index ca3e28567..857f64daf 100644
--- a/home.admin/assets/lnd.service
+++ b/home.admin/assets/lnd.service
@@ -12,7 +12,7 @@ After=bitcoind.service
 # get var PUBIP from file
 EnvironmentFile=/run/publicip
 
-ExecStart=/usr/local/gocode/bin/lnd --externalip=${PUBLICIP}
+ExecStart=/usr/local/bin/lnd --externalip=${PUBLICIP}
 PIDFile=/home/bitcoin/.lnd/lnd.pid
 User=bitcoin
 Group=bitcoin
diff --git a/home.admin/assets/lnd.tor.service b/home.admin/assets/lnd.tor.service
index 4a8cfa721..e3d2f9772 100644
--- a/home.admin/assets/lnd.tor.service
+++ b/home.admin/assets/lnd.tor.service
@@ -12,7 +12,7 @@ After=bitcoind.service
 # get var PUBIP from file
 EnvironmentFile=/run/publicip
 
-ExecStart=/usr/local/gocode/bin/lnd --tor.active --tor.v3 --externalip=${PUBLICIP} --listen=127.0.0.1:9735
+ExecStart=/usr/local/bin/lnd --tor.active --tor.v3 --externalip=${PUBLICIP} --listen=127.0.0.1:9735
 PIDFile=/home/bitcoin/.lnd/lnd.pid
 User=bitcoin
 Group=bitcoin