Merge branch 'validation'
fixing validation errors 1