How much of Patriot Act II has already been passed?

According to this article in the San Antonio Current, H.R. 2417, the Intelligence Authorization Act for Fiscal Year 2004, the annual funding bill for the various intelligence agencies, had much of the language of John Ashcroft’s proposed extensions to the Patriot Act inserted into it. Specifically, the types of financial institutions which the FBI may demand access to private records without a court order has been broadened to include a wide range of other businesses. This page from gives an overview of the bill but doesn’t mention any expansion of surveillance authority. In this exerpt from the Congressional Record, some representatives have voiced their opposition to the bill.

My question is, just how many of the Attourney General’s proposed expansions to the Patriot Act have been signed into law? What others are there? And just how significant is this bill?

If at all possible, please keep the answers suitable for General Questions.

Nothing at all? Or am I mistaken in thinking this is an important issue?