Integrate review comments 2