changed name of some functions