Edited setup1.sh to account for merged old one