changed function and variable names