more re-arranging stuff