Minor changes to parameterization, which is not yet completed