modify some parts according to the runing