Yes, that figure included the notion that there would be one office to cover public office holders, the members, and the Senate. If the Senate were not included—I'm referring to one of the amendments—that number would go down.
On November 1st, 2006. See this statement in context.