implement validation
Merge branch 'staging'