Made OD require less obedience
Merge branch 'master' into dev
Validation displays on screen