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

This reverts commit 020e692b6d61cff3fd939086c9703559e6085061.