updated api
resolved merge