changed a few variable names