new validator
Merge branch 'new-validation'