+1 to @lukasa's comments re undoing the data-related checks.