renamed functions to fit name convention