Update all with new functions: