Modified 2 classes.