Another attempt to get the formatting right.