Revised code for Comments checkpoint