Better selection of valid data