Improved error discrimination / set of errors.