modify some dugs
modify some function