re-aranged for pretty