Added saving of raw scores