update per discussion in #54