add references to addComment, add back optimization