do some re-arranging