changes in some classes