Addressed PR2 comments