Changed some variable names.