Setup.sh improved