addressing comments from @antgonza