Modify build-and-run.sh