Little modifications in the variables and function names