changed some variable names