updated data validation