Improved classes and score