Some rearranging.