some re-organization..