updated function names and variable names