Finished Obedience
Applied fixes from 19560dda07865358c94ace785b746d3149fb7356