Revert "Revert "Updates as per MIke's Feedback may 22""

This reverts commit 7d3a9d12a6b06c9fc8cc76487bc3f2661c5abd8d.