addressing last comments from @adamrp