Change some functions