Further tweaking to make the presentation closer to the paper.