moved scoring to generic place