added additional parameter names and comments