more re-arranging :/