slight change to variable names