Addressed or tracked feedback from @raynos