updated validation
merge