a little re-arranging