working on the review and comment section