Updated comments to be able to take comments and to take reply to comment