refactored function names