little re-arranging