changes based on discussion in #4