More modifications to the run script