changed variable names again