* further changes based on discussion of #506