This needs updated based on the function signature change.