Added new elements and changed function names for a better overview.