Changed a few variable names