modify some function

modify some function