added api functionality
resolved merge conflict