All changes are from John, except for: