changed to reflect new function names