Review comments from Andy