Validation Changes 6