pulling Johns edits