update to use new functions