#8: comments update