addressing @adamrp's comments