Checking Validation

Fixing issues