renamed parameters per review suggestions