I'm not sure whether I already mentioned this, but it seems to me that this simple amendment would make things even clearer for everyone, not to mention more understandable and specific. It would amend the clause in question by replacing the “or” with an “and” and prescribing a time limit. That's the gist of NDP amendment 8.
I'll stop there.