Validation changes. Working!