Class Improvement
Final