Some re-arranging