new version, new calculation of the values and more parameter options