Matched the functionality that I added for the comments for the submissions as well