Should be a first try for the new scoring system