Incorporated John's comments