Incorporated more validation changes
More validation