minor changes in function names