Validation changes made