Why changing the run options in this PR? Should we leave them?