Improve run.sh