Added one more class. Modified