Validation Updated