Updating: renaming some functions