adjust validation
separate concerns