Revert "Revert "Following up on comments that have been addressed""

This reverts commit 9dc10812a1cdc0adff620a1744b53dcd440d7cfa.
Revert "Revert "Revert "Following up on comments that have been addressed"""

This reverts commit ae9eb6ec71d3a603cd7c8a4ba242a8ebca008a3d.