edit some functions