revised function names