changed some function names