"The larger challenge is figuring out what else to include in the package of national security reforms," Goodale said.

No, the larger challenge is making sure whatever surveillance bill the Liberals come up with, that it is charter-proof, and that Canadians' "reasonable expectations of privacy" (Supreme Court) are protected. What isn't necessary is an omnibus packed with loopholes for CSIS, CSEC, and police agencies to wander through at their leisure.