Committing changes to the comments, after review with engineers.