made changes to reflect the new variable names