Feedback from @btford