changed some variable name