Incorporate comments from mistydemeo