changed variable names
updates