updated validation