@johnjamesjacoby's udpate for data validation.