Update for new function