Updating Trond's changes before the renaming