More rearranging to my liking.