changing variables to match the rest of the code