modify some interface
resolved merge confilts