I think we should handle changes to each section separately. Of course there are interactions between, but there are several discrete proposals in each of the two version of changes, and I might like some and not others. I would hate to have to vote against the ones I like just because they are tied to ones I greatly dislike.