Added option to select good data