update based of comments