working on Class System