update
update
added the validation function
Merge branch 'ToroBranch'