Modify Validation Check