Updated to add flagging to comments