diff --git a/bsx/setup.sh b/bsx/setup.sh
index 5890617..6f53ff9 100755
--- a/bsx/setup.sh
+++ b/bsx/setup.sh
@@ -5,22 +5,19 @@ red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
-## Download & Install coincurve stuff
-cd $SWAP_DATADIR
-git clone https://github.com/basicswap/coincurve -b basicswap_v0.2 coincurve-basicswap
-cd $SWAP_DATADIR/coincurve-basicswap
-$SWAP_DATADIR/venv/bin/pip install .
-
 ## Clone basicswap git
 cd $SWAP_DATADIR
 git clone https://github.com/basicswap/basicswap -b dev
 cd $SWAP_DATADIR/basicswap
+git checkout -b pr_127
+git pull --rebase origin pull/127/head
+git rebase dev
+
 ## Macos
 if [[ $MACOS ]]; then
     $SWAP_DATADIR/venv/bin/pip install certifi
 fi
 ## Install basicswap
-$SWAP_DATADIR/venv/bin/pip install wheel
 $SWAP_DATADIR/venv/bin/pip install .
 
 ## Decide a source for Monero's restore height
diff --git a/bsx/update.sh b/bsx/update.sh
index 356a2dd..c7f2bee 100755
--- a/bsx/update.sh
+++ b/bsx/update.sh
@@ -4,7 +4,7 @@ cd $SWAP_DATADIR/basicswap
 
 # Download updated scripts
 echo "Updating basicswap-bash scripts" && sleep 1
-git clone https://github.com/nahuhh/basicswap-bash -b dev
+git clone https://github.com/nahuhh/basicswap-bash -b dev2
 cd basicswap-bash
 
 # Move scripts