pulled in Elliot's edits