fix last commit; renamed some Parameters