tweaked some variable names