Addressed PR3 comments