Changed the Class file