few changes in method and variable names