changed the format of the comments, fields; only mandatory fields now.