Implement jvazquez-r7 comments