some re-write of Class Data section