Ordinance 7 Updates

* indicates required