Instate a diverse group highly trained in Critical Thinking and Sustainability to represent every State and its population. To be instated to provide Critical Thinking and Sustainability oversight and management of all National Security Agency (NSA) data collection, assessments, and directives.
http://eliminate-all-corruption.pbworks.com
Because this large representative body of individuals will act as a covert, but highly trained publicly elected governing body, this will allow the NSA to continue data collection without warrant. The Senate and Congress will provide "oversight and not direct control" of this new branch in our political structure, thereby providing the needed checks and balances.
This provides increased individual freedoms while also increasing national security.