change to reflect new function names