final rewrite of the constraints