Adjust comments as required