added some parameterization