little changes in all classes