Validation has been improved