A little re-arranging.