add comment and report logic