gistfile1.txt

diff --git a/scripts/common-functions.sh b/scripts/common-functions.sh
index 7be2527d9..1042cc490 100644
--- a/scripts/common-functions.sh
+++ b/scripts/common-functions.sh
@@ -3,10 +3,11 @@
 base_common="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 function find_binary {
-  pushd "$base_common/.." > /dev/null || exit
-  binpath=$(stack path --local-install-root)/bin
-  popd > /dev/null || exit
-  echo "$binpath/$1"
+  echo "$(which $1)"
+  #pushd "$base_common/.." > /dev/null || exit
+  #binpath=$(stack path --local-install-root)/bin
+  #popd > /dev/null || exit
+  #echo "$binpath/$1"
 }
 
 function find_build_binary {
diff --git a/scripts/launch/demo.sh b/scripts/launch/demo.sh
index 99bac612f..47d5205c7 100755
--- a/scripts/launch/demo.sh
+++ b/scripts/launch/demo.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -eo xtrace
 
+export PATH=$PATH:$(nix-build -A cardano-sl-node-static)/bin:$(nix-build -A cardano-sl-tools)/bin:$(nix-build -A cardano-sl-wallet-new)/bin
+
 declare WALLET_FLUSH
 
 # Make sure we're in a tmux session.
@@ -29,12 +31,6 @@ base=$(dirname "$0")
 # shellcheck disable=SC1090
 source "$base"/../common-functions.sh
 
-# If stack-work doesn't exist use function
-if [[ ! -d "$base/../../.stack-work" ]]; then
-    stack_build
-    # TODO: Maybe wanna have an option to rebuild?
-fi
-
 # Define the default amount of nodes to run
 DEFAULT_NODES_N=4
 
@@ -158,17 +154,6 @@ while [[ $i -lt $panesCnt ]]; do
           wallet_args="$wallet_args --wallet-debug"
       fi
   fi
-  if [[ $WALLET_TEST != "" ]] && [[ $i == $((n-2)) ]]; then
-      if [[ $WALLET_CONFIG != "" ]]; then
-          conf_file=$WALLET_CONFIG
-      fi
-      wallet_args=" --tlscert $base/../tls-files/server.crt --tlskey $base/../tls-files/server.key --tlsca $base/../tls-files/ca.crt $wallet_flush" # --wallet-rebuild-db'
-      wallet_args="$WALLET_EXTRA_ARGS --new-wallet $wallet_args --wallet-address 127.0.0.1:8091"
-      exec_name="$WALLET_EXE_NAME"
-      if [[ $WALLET_DEBUG != "" ]]; then
-          wallet_args="$wallet_args --wallet-debug"
-      fi
-  fi
   if [[ $i -lt $n ]]; then
     node_args="$(node_cmd $i "$wallet_args" "$system_start" "$config_dir" "$conf_file" "$run_dir" "$run_dir/logs")"
     node_=$(find_binary $exec_name)
@@ -180,6 +165,10 @@ while [[ $i -lt $panesCnt ]]; do
 
         # shellcheck disable=SC2154
         full_node_args="$node_args $reb $no_ntp $keys_args $rts_opts"
+        if [[ $WALLET_CLIENT_AUTH_DISABLE != "" ]]; then
+            # shellcheck disable=SC2154
+            full_node_args="$full_node_args --no-client-auth"
+        fi
 
         CONFIG_PATH="$run_dir/launcher-config-$i.yaml"