diff --git a/build-a-pi b/build-a-pi
index 8992265..27a21fd 100644
--- a/build-a-pi
+++ b/build-a-pi
@@ -446,37 +446,26 @@ sleep 2
 pip3 install gps
 pip3 install maidenhead
 pip3 install psutil
+pip3 install OSGridConverter
 cd $HOME/bin
-wget https://raw.githubusercontent.com/m0iax/js8calltools/master/js8callgpsUI.py || echo "Can't download M0IAX Tools" >> $BUILDLOG
-wget https://raw.githubusercontent.com/m0iax/js8calltools/master/gps_listener.py
-wget https://raw.githubusercontent.com/m0iax/js8call_aprsmessaging_interface/master/aprs_msgJS8Call.py
-wget https://raw.githubusercontent.com/m0iax/js8calltools/master/configAndSettings.py
-chmod +x js8callgpsUI.py aprs_msgJS8Call.py
-cat > js8msg.desktop <<EOF
+git clone https://github.com/m0iax/JS8CallUtilsGPSD.git
+chmod +x gpsdGPSListener.py js8callutilsGPSD.py
+mv $HOME/bin/JS8CallUtilsGPSD/* $HOME/bin
+rm -rf JS8CallUtilsGPSD
+
+cat > js8tools.desktop <<EOF
 [Desktop Entry]
-Name=JS8Call Messenger
-GenericName=JS8Call Messenger
-Comment=Message Helper for JS8Call
-Exec=$HOME/bin/aprs_msgJS8Call.py
+Name=M0IAX JS8 Tools
+GenericName=M0IAX JS8 Tools
+Comment=GPS & Message Tool for JS8Call
+Exec=$HOME/bin/js8callutilsGPSD.py
 Terminal=false
 Type=Application
 Categories=Network;HamRadio;
 EOF
 
-sudo mv js8msg.desktop /usr/share/applications/
+sudo mv js8tools.desktop /usr/share/applications/
 
-cat > js8gps.desktop <<EOF
-[Desktop Entry]
-Name=JS8Call GPS Tool
-GenericName=JS8Call GPS Tool
-Comment=GPS Tool for JS8Call
-Exec=$HOME/bin/js8callgpsUI.py
-Terminal=false
-Type=Application
-Categories=Network;HamRadio;
-EOF
-
-sudo mv js8gps.desktop /usr/share/applications/
 echo "MOIAX tools installed" >> $BUILDLOG
 fi