merge feedback from @vanstee