update validation handling