chnaged all classes