Improve runscript