Address Feedback from Chris

:)