Update notes for submitted changes

* Rework use of constraints to ease testing