changed some variable names to be consistent with the new norm