updated a few variable names