Improved parametrization