John's requested changes

John's requested changes