Amendments To The Foreign Intelligence Surveillance Act, S. 2586 And S. 2659