Feedback from @jpasqua