renaming some functions