moved some code in setup.sh to make more sense