Addressed comment on PR2