address comments form @adamrp