renamed functions and variables