Addressing @adamrp's comments