Updating usage of new functions.