included more parameterization