more re-aranging