Review comments from Andrew