Validate improve