addressing initial comments from @adamrp