diff --git a/install-powerwall.sh b/install-powerwall.sh
index d5b153d..f7a428e 100755
--- a/install-powerwall.sh
+++ b/install-powerwall.sh
@@ -16,15 +16,15 @@ fi
 echo ""
 echo -e "${idsCL[LightGreen]}PowerWall Installation Script${idsCL[Default]}"
 
-do_with_root $APTFUNC -y install wget curl git
+$APTFUNC -y install wget curl git
 
-do_with_root set -eu
-do_with_root git clone https://git.schroedercity.com/voltron/powerwall.git /opt/idssys/powerwall
-do_with_root ln -s /opt/idssys/powerwall/run.sh /usr/local/bin/powerwall
+git clone https://git.schroedercity.com/voltron/powerwall.git /opt/idssys/powerwall
+ln -s /opt/idssys/powerwall/run.sh /usr/local/bin/powerwall
+ln -s /opt/idssys/powerwall/run.sh /usr/local/bin/pw
 
 if [ ! -d "/opt/idssys/defaults" ]; then
-	do_with_root set -eu
-	do_with_root git clone https://git.schroedercity.com/voltron/iDS-Defaults.git /opt/idssys/defaults
+	set -eu
+	git clone https://git.schroedercity.com/voltron/iDS-Defaults.git /opt/idssys/defaults
 fi
 
 echo -e "" > /opt/idssys/powerwall/settings.conf