Reformat, include more notes.