Modify some function