Changes for parameterization