Modified setup.sh - peter