Changed variable names again