Revising validation code
Revising validation code