Changes to correct variable names