address comments from @adamv