The pro-civil-liberties Democratic version of the surveillance bill just passed the House.
The final vote was 213-195.
There are all sorts of things about this version that are better than the White House/Senate Dem version, not least of which is no telecom immunity.
Late Update: The final tally has been revised to 213-197.