updated validation on client