update for new functions