new functions, still 2 missing