Modify some functions