A little rearranging before some editing.