add some functions and change function-names