edited variable names