update per discussion in #39