changing some function names