Merged ParameterScan 1 and 2