updated validation
updated validation