Review comments, see #3