implemented much better validation
Merge branch 'origin/back-end'