Use the new function signature