final comments fixed