minor relevant changes in function names