added new parameter and renamed some parameters