address @antgonza comments