changing parameters to be correct