few new functions, add&edit