addressing @adamrp comments