Addressed Reynolds PR comments
Addressed Reynolds PR comments