address @adamrp comments