Validation based on other questions response
Merge branch 'validation_update'