fixed other variable names