Address comments from Mark