added retrieval of comments