changed variable names to match