modified some classes.