Small changes in parameters calculation