added functions
merge larissa fritz