modified for consistency of variable naming