Addressed commit of PR2
Addressed PR3 comments