remove wrong code
rename parameters