Improved scoring