PR feedback from @smitchsmith