review api changes
resolved merge conflicts
code
merged