Updated review comments from Mark