Made more control over parameters used in runs