improve names of new functions