Update for better parameterization.