address @adamrp @antgonza comments