Validation now works for most cases.