Final comment changes