change the format to include comments