diff --git a/app/stable/x86_64/CHIRP.bapp b/app/stable/x86_64/CHIRP.bapp
index d870ba9..792aa42 100755
--- a/app/stable/x86_64/CHIRP.bapp
+++ b/app/stable/x86_64/CHIRP.bapp
@@ -8,28 +8,29 @@ W3='https://chirp.danplanet.com/projects/chirp/wiki/Home'
 
 INSTALL(){
     CUR_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-
-    sudo -A apt install -y flatpak
+    sudo -A apt install python-wxtools -y
     cd ${BAPSRC}
-    LATEST=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ | grep flatpak | sed 's/.*href="//;s/">.*//' | head -1)
-    wget https://trac.chirp.danplanet.com/chirp_daily/LATEST/$LATEST
-    sudo -A flatpak install -y $LATEST
+    date=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//')
+    wheel=https://trac.chirp.danplanet.com/chirp_next/next-${date}/chirp-${date}-py3-none-any.whl
+    wget ${wheel}
+    pip install ${wheel} --force-reinstall
+
 }
 
 
 REMOVE(){
-    sudo flatpak uninstall -y chirp
+    pkg=$(ls ${BAPSRC} | grep chirp)
+    pip uninstall ${pkg} -y
+    cd ${BAPSRC}
+    rm ${pkg}
 }
 
 VERSION(){
-    CHECK=$(flatpak list | grep chirp)
-    if [ -z "${CHECK}" ]; then
+    if ! hash chirp 2>/dev/null; then
         CURRENT=0
-        NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ |
-			grep .tar.gz | awk -F 'chirp-daily-' '{print $2}' | head -c 8)
+        NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//')
     else
-        CURRENT=$(flatpak run com.danplanet.chirp --version | awk '{print $2}' | sed 's/daily-//')
-        NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ |
-			grep .tar.gz | awk -F 'chirp-daily-' '{print $2}' | head -c 8)
+        CURRENT=$(chirp --version | awk '{print $2}' | sed 's/next-//')
+        NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//')
     fi
 }