renamed functions (after removing parameter in previous commit)