integrating comments from PR