Final with completed comments