refactored function names.