revert to Brian's edits