address comments by @kingjr