pull request to merge richard's incorporation of eric's edits