changed some functions' name