made changes for variable names