Some rearranging...