final changes for class