diff --git a/main/setup.sh b/main/setup.sh
index 0c2cacd..e794a59 100644
--- a/main/setup.sh
+++ b/main/setup.sh
@@ -157,10 +157,10 @@ echo " "
 echo " "
 echo "Installing wine/winetricks"
 echo " "
-apt-get install --no-install-recommends -y wine wine32 cabextract
-wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
-chmod +x winetricks
-mv -u winetricks /usr/local/bin
+# apt-get install --no-install-recommends -y wine wine32 cabextract
+# wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
+# chmod +x winetricks
+# mv -u winetricks /usr/local/bin
 
 echo " "
 echo "INFO ! Installing Steam."
@@ -178,18 +178,26 @@ chown ${USER} ProtonUp-Qt-${PROTON_VERSION}-x86_64.AppImage
 echo " "
 echo "INFO ! Installing TeamSpeak."
 echo " "
-# wget --no-cache https://www.teamspeak.com/versions/client.json -O client.json
-# TS_VERSION_CHECK=$(cat client.json | grep version | head -1 | awk -F: '{print $4}' | sed 's/[",]//g' | sed "s/checksum//g")
-# TS_VERSION=${TS_VERSION_CHECK}
-# echo "Latest client version from Teamspeak:$TS_VERSION"
-# rm -fr client.json
-# echo "INFO ! Downloading and installing Teanspeak-client-${TS_VERSION}"
-# wget --no-cache https://files.teamspeak-services.com/releases/client/${TS_VERSION}/TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run -O TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run
-# chmod +x TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run
-# ./TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run
-# rm -fr TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run
-# chown -R ${USER} TeamSpeak3-Client-linux_amd64/
-# mv -u TeamSpeak3-Client-linux_amd64/ /home/${USER}
+
+if [ -e /TeamSpeak3-Client-linux_amd64 ]
+	then
+		echo "INFO ! TeamSpeak3-Client-linux_amd64 found ... will not download."
+	else
+		echo " "
+		echo "WARNING ! TeamSpeak3-Client-linux_amd64 not found ... will download now."
+            wget --no-cache https://www.teamspeak.com/versions/client.json -O client.json
+            TS_VERSION_CHECK=$(cat client.json | grep version | head -1 | awk -F: '{print $4}' | sed 's/[",]//g' | sed "s/checksum//g")
+            TS_VERSION=${TS_VERSION_CHECK}
+            echo "Latest client version from Teamspeak:$TS_VERSION"
+            rm -fr client.json
+            echo "INFO ! Downloading and installing Teanspeak-client-${TS_VERSION}"
+            wget --no-cache https://files.teamspeak-services.com/releases/client/${TS_VERSION}/TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run -O TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run
+            chmod +x TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run
+            ./TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run
+            rm -fr TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run
+            chown -R ${USER} TeamSpeak3-Client-linux_amd64/
+            mv -u TeamSpeak3-Client-linux_amd64/ /home/${USER}
+fi
 
 echo " "
 echo "INFO ! Removing Games."