Make the vin check more sophisticated