v5.1 before adding comments for submit