changed the name of some functions