Did some re-arranging and stuff