Little changes

Validation Changes