updated some function names