Score class reworked