Validation Update

updated validation methods