- 2nd draft of comments impl