rewrites according to validation & comments from prev rel