changed some classes.