Updated to new function names