Changed Some Classes.