validation changes
merge