Added a class, Modified 2.