
454 F.Supp.2d 957 (2006)
INFORMATICA CORPORATION, et al., Plaintiffs,
v.
BUSINESS OBJECTS DATA INTEGRATION INC., Defendants.
No. C 02-3378 JSW (JL).
United States District Court, N.D. California.
July 14, 2006.
*958 Albert Lukas Sieber, Fenwick & West LLP, Kenneth B. Wilson, Stefani E. Shanberg, Perkins Coie LLP, San Franciso, CA, Carolyn Chang, Darren E. Donnelly, David Douglas Schumann, J. David Hadden, Lynn H. Pasahow, Fenwick & West LLP, Mountain View, CA, Lynne A. Maher Fenwick & West LLP, Palo Alto, CA, for Plaintiff Informatica Corporation.
Theodore T. Herhold, Daniel J. Furniss, Robert D. Tadlock, Townsend and Townsend and Crew LLP, Palo Alto, CA, Ian L. Saffer, Townsend and Townsend and Crew LLP, Denver, CO, for Defendants.

ORDER GRANTING a PART MOTION TO COMPEL (Docket # 187)
LARSON, Chief United States Magistrate Judge.

Summary
Plaintiff Informatica Corporation ("Informatica") moves to compel answers to interrogatories and production of documents which Defendant BODI withholds as protected by the attorney-client privilege and the work product doctrine. The motion is granted in part. This Court finds that BODI waived attorney-client privilege for both pre- and post-filing communications on the subject of the opinion on which it relies for its advice-of-counsel defense and for work product on the same subject which was communicated to BODI, including documents which reference any attorney-client communications on that *959 subject. Such waiver applies to opinion counsel and trial counsel alike.
While opinion counsel and trial counsel can be walled off from each other, the immurement is immaterial  what matters, according to the Federal Circuit in EchoStar, is the state of mind of BODI relative to infringement. It is immaterial whether BODI's opinion counsel and trial counsel are from the same firm, different firms or are even the same person. What matters is the following:
1. BODI relies on advice of counsel as a defense to Informatica's charge that it willfully infringed Informatica's patents;
2. Therefore, BODI waives any privilege for communications with counsel on the subject of the opinion or advice on which it relies, as well as work product on that subject communicated to BODI or which refers to communications on that subject; and
3. Informatica alleges that BODI continues to infringe Informatica's patents;
4. Therefore, Informatica is entitled to information subject to waiver which BODI received even after Informatica filed its complaint; and
5. The categories of information which BODI must turn over to Informatica include (a) attorney-client communications with any counsel on the subject of the opinion or advice on which BODI relies; (b) work product communicated to BODI on that same subject; (c) work product which reflects any communication on that subject.

Background
Informatica Corporation ("Informatica") is suing Business Objects Data integration, Inc. ("BODI", formerly Acta Technology) for patent infringement. All discovery in this case has been referred by the district court (Hon. Jeffrey S. White) as provided by 28 U.S.C. § 636(b) and Civil Local Rule 72. The district court on April 18 approved the parties' stipulation re damages, expert reports and the discovery cut-off. Fact discovery closed June 5, 2006.
BODI contends that disclosures of privileged information and the deposition of opinion counsel should be delayed until after the parties file their motions for summary judgment. Pursuant to the order setting dates, [Docket No. 147], BODI produced its written opinions of counsel on January 31, 2006. Tadlock Decl. ¶ 11. Informatica recently has sought to depose both the attorney who authored the opinions, and also the BODI representative who received the opinion (who happens to be BODI's in-house counsel). Id. ¶ 12. Such depositions would require further disclosure of attorney-client communications and attorney work product at a time when the parties are preparing expert reports and motions for summary judgment. Id. Summary judgment motions were scheduled to be filed by June 16, 2006 and argued on August 4, 2006. [Docket No. 147]. However, Judge White vacated the hearing on summary judgment because, although the parties agreed to try the case on the basis of representative claims, they cannot agree on what those claims are:
Although both parties agree that this Court may utilize a representative claims approach for trial, they disagree over what those representative claims should be. The Court exhorts the parties further meet and confer in person in an effort to resolve this dispute and submit a status report by no later than June 26, 2006. Until this dispute is resolved, the Court cannot proceed with the current schedule set for dispositive motions in this matter.
(Order filed 6/12/2006, at docket # 224)
The parties on June 26 advised the district court that they would be submitting a stipulation as to the' representative claims. *960 (Status Report at Docket # 225) The district court on July 5 approved the parties' stipulation extending damages expert discovery to August 31 (Docket # 229).

Discovery Dispute
This Court received the parties' joint letter brief arguing the merits of their positions on the scope of any waiver of the attorney-client privilege and the work product doctrine resulting from BODI's assertion of the advice-of-counsel defense. An additional wrinkle is that one of the attorneys who rendered an opinion on infringement is a member of the same firm which represents BODI in this litigation.
Informatica asks this Court to compel BODI to include all responsive attorney-client communications and work product regarding its non-infringement contentions in response to Interrogatory No. 3, and supplement all discovery responses to include responsive attorney-client communications and work product. Furthermore, Informatica asks the Court to order the Townsend firm and attorney Philip H. Albert to produce all attorney-client communications and attorney work product regarding infringement or non-infringement of the patents-in-suit in response to the subpoenas issued by Informatica.
In its portion of the letter brief, BODI "respectfully requests that it be allowed full briefing on the merits if the Court were to consider granting Informatica's motion in whole or in part." (Letter brief, Docket # 187, at pages 3 and 4)
The Court was inclined to grant Informatica's motion and ordered the parties to brief the issue of the existence and scope of the waiver of both attorney-client privilege and the work product doctrine, particularly in light of the following authorities: AKEVA L.L.C. v. Mizuno Corporation, 243 F.Supp.2d 418 (M.D.N.C.2003); Novartis Pharmaceuticals Corporation v. EON Labs Manufacturing, Inc., 236 F.R.D. 396 (D.Del.2002); Convolve, Inc. v. Compaq Computer Corp., 224 F.R.D. 98 (S.D.N.Y.2004); David Hricik, How Things Snowball: The Ethical Responsibilities and Liability Risks Arising from Representing a Single Client in Multiple Patent-related Representations, Georgetown Journal of Legal Ethics, Spring 2005, 18 Geo. J. Legal Ethics 421.
The parties then requested an opportunity also to brief the impact on this case of the decision by the Federal Circuit in the case of In re EchoStar Communications Corp. 448 F.3d 1294 (Fed.Cir.2006), which was decided May 1, 2006. The Court granted their request and briefing was submitted. The Court took the matter under submission.

Argument
BODI argues that this Court should give precedence to the Federal Circuit's decisions and specifically EchoStar, which absolved from disclosure any work product not disclosed to the client.
When an alleged patent infringer asserts an advice-of-counsel defense regarding willful infringement, it waives its attorney-client privilege and work-product immunity for any document or opinion that embodies or discusses a communication to or from it concerning whether that patent is valid, enforceable, and infringed by the accused; waiver includes not only any letters, memorandum, conversation, or the like between the attorney and his or her client, but, when appropriate, any documents referencing a communication between attorney and client.
Id. at 1304.
BODI argues that there is a significant difference between the same individual lawyer being both opinion and litigation counsel and those roles being played by different lawyers with the same firm. BODI contends that "[w]here the same individual lawyer does not act as both trial *961 and opinion counsel, the proper balance is to not require disclosure of such sensitive communications, which are not relevant to the alleged infringer's state of mind. [Docket No. 198, ¶ 4-6.]"
BODI urges this Court to "not extend the waiver of attorney-client privilege to BODI's trial counsel, but rather follow the Northern District cases that find the trial counsel's communications are not discoverable. E.g., Sharper Image Corp. v. Honeywell International Inc., 222 F.R.D. 621 at 634-46 (N.D.Cal.2004); Collaboration Properties, Inc. v. Polycom, Inc., 224 F.R.D. 473 at 475-77 (N.D.Cal.2004); Terra Novo, Inc. v. Golden Gate Products, Inc., 2004 WL 2254559 at *3 (N.D.Cal. 2004)."
This Court examined those cases and finds they are factually distinguishable: in Sharper Image there was separately retained litigation counsel. In Collaboration Properties trial counsel did not provide any pre-litigation advice. In Terra Novo, trial and litigation counsel were with separate firms. Consequently, BODI's citation to these cases is not than convincing.
BODI asks this Court to interpret EchoStar to hold that attorney work product is not discoverable unless it is communicated to the client or discusses a communication with a client. In re EchoStar, 448 F.3d at 1305. ("counsel's legal opinions and mental impressions that were not communicated . . . are . . . not within the scope of the waiver . . . work product that was not communicated to EchoStar or does not reflect a communication is not within the scope of EchoStar's waiver because it obviously played no part in EchoStar's belief as to infringement of the '389 patent.") Id.
The Federal Circuit reasoned that "if a legal opinion or mental impression was never communicated to the client, then it provides little if any assistance to the court in determining whether the accused knew it was infringing, and any relative value is outweighed by the policies supporting the Work-product doctrine." Id. at 1304. Thus, says BODI, if this Court orders production of any of trial counsel's materials, it should extend only to materials that were communicated to BODI, not uncommunicated work product. BODI asks the Court not to ignore this clear mandate from EchoStar.
Informatica argues that BODI's trial counsel's uncommunicated work product is discoverable because Mr. Albert and BODI's trial counsel are from the same law firm. [Docket No. 206 at 7-8.] To the extent that Informatica relies on Novartis for this proposition, BODI asks the Court to find that case distinguishable because there the same individual attorney acted as both opinion and trial counsel. Novartis Pharms. Corp. v. Eon Labs Mfg., 206 F.R.D. 392, 395 (De.Del.2002) ("Eon's opinion counsel, Mr. Pontani, has actually entered an appearance in this matter.") BODI points to the appearance by opinion counsel in Novartis as distinguishing that case from the case at bar, where opinion counsel has not made an appearance.
Moreover, to the extent Novartis is inconsistent with EchoStar, BODI urges this Court to rule that the former is no longer good law and deny Informatica's motion to compel production of uncommunicated work product. BODI argues that EchoStar directly contradicts this argument. With regard to work product, the Federal Circuit determined that uncommunicated work product "provides little if any assistance" in determining a defendant's state of mind. In re EchoStar, 448 F.3d at 1305.
That Mr. Albert and BODI's trial counsel are members of the same firm, argues BODI, has no bearing on whether any given work product document was communicated to BODI, in which case it might *962 affect BODI's state of mind, or uncommunicated, in which case it would not. BODI asks this Court to find, under the rationale of EchoStar, that the identity of the lawyer providing the opinion and that lawyer's affiliation, if any, with a law firm, is irrelevant and that the sole relevant inquiry is what the alleged infringer knew or did not know.
Informatica also claims that BODI's trial counsel must produce its communications and work product because Mr. Albert allegedly was not in any way separated from BODI's trial counsel. Mr. Albert has stated under oath that he has never been a member of the Townsend litigation team and that his last communication with trial counsel about the Informatica patents-in-suit was over three years ago, on November 14, 2002. [See Docket No. 199 ¶ 16]. There is no evidence that Mr. Albert communicated with BODI's trial counsel, even though they are members of the same firm as Mr. Albert.
Finally, BODI asks the Court for procedural reasons not to compel any further response to Interrogatory 3, which it contends is improper for reasons that have nothing to do with the work product doctrine and the waiver resulting from the advice-of-counsel defense. BODI contends that any dispute over BODI's response to Interrogatory 3 was resolved during the meet and confer between counsel, and the decision by the court in EchoStar does not affect this resolution. Prior to filing this motion, counsel for BODI agreed to supplement its response to Interrogatory 3, but at all times maintained that it would not conduct any product comparisons requested by the interrogatory that had not been previously conducted, and that it would not create work product that did not already exist. [Docket No. 201 ¶¶ 5-6 & Exh. 3.]
Counsel for Informatica admits that this is all that BODI's counsel agreed to do, [Docket No. 207 ¶ 6], but now contends that this agreement was not a resolution of the dispute, but rather was a unilateral agreement by BODI to provide additional information, which Informatica could then review and either accept or reject. [Id. ¶ 7.] BODI says it did not agree to provide a supplemental response simply so Informatica could review it and then file this motion anyway. Rather, says BODI, the agreement was that BODI's production of the supplemental response would resolve all disputed issues. [Docket No. 201 ¶ 15, 9.]
This Court is not in a position to enforce agreements over which the parties now disagree. It can only apply the law to the facts in this case, and therefore declines to base its decision on any putative agreement between the parties. The legal and factual analysis follows.

Analysis
The question before this Court is the scope of the waiver of privilege by BODI after it asserted an advice-of-counsel defense.
Federal Circuit law, rather than the law of the regional circuit, applies to substantive legal issues in a patent case.
In this petition, we apply our own law, rather than the law of the regional circuit. This case involves the extent to which a party waives its attorney-client privilege and work-product immunity when it asserts the advice-of-counsel defense in response to a charge of willful patent infringement. "Federal Circuit law applies when deciding whether particular written or other materials are discoverable in a patent case, if those materials relate to an issue of substantive patent law."
In re EchoStar, 448 F.3d at 1298.
In the underlying case, TiVo sued EchoStar for infringement of its U.S. Patent *963 No. 6,233,389 ("the '389 patent"). In response to the allegation of willful infringement, EchoStar asserted the defense of reliance on advice of counsel. Prior to filing the action, EchoStar relied on advice of in-house counsel. After the action was filed, EchoStar obtained additional legal advice from Merchant & Gould but elected not to rely on it. Presumably to explore further EchoStar's state of mind in determining that it did not infringe the patent, TiVo sought production of documents in the possession of EchoStar and Merchant & Gould.
The district court ultimately found waiver of immunity for all work product of Merchant and Gould, both pre and post-filing of the complaint, whether or not communicated to EchoStar. Echostar petitioned the Federal Circuit for a writ of mandamus with respect to Merchant and Gould documents not communicated to EchoStar. No in-house counsel documents were at issue.
Questions of privilege and discoverability that arise from assertion of the advice-of-counsel defense necessarily involve issues of substantive patent law, see In re Spalding Sports Worldwide, Inc., 203 F.3d 800, 803-04 (Fed.Cir.2000) (applying Federal Circuit law to question of attorney-client privilege between patent attorney and patentee). Id.
The attorney-client privilege protects disclosure of communications between a client and his attorney. U.S. v. Zolin, 491 U.S. 554, 562, 109 S.Ct. 2619, 105 L.Ed.2d 469 (1989); Upjohn Co. v. U.S., 449 U.S. 383, 389, 101 S.Ct. 677, 66 L.Ed.2d 584 (1981). Once a party announces that it will rely on advice of counsel, for example, in response to an assertion of willful infringement, the attorney-client privilege is waived. "The widely applied standard for determining the scope of a waiver of attorney-client privilege is that the waiver applies to all other communications relating to the same subject matter." Fort James Corp. v. Solo Cup Co., 412 F.3d 1340, 1349 (Fed.Cir.2005). Cited in In re EchoStar, 448 F.3d at 1298-1299.
In contrast to the attorney-client privilege, the work-product doctrine, or work-product immunity as it is also called, can protect "documents and tangible things" prepared in anticipation of litigation that are both non-privileged and relevant. Fed.R.Civ.P. 26(b)(3). Unlike the attorney-client privilege, which protects all communication whether written or oral, work-product immunity protects documents and tangible things, such as memorandums, letters, and e-mails. The work-product immunity promotes a fair and efficient adversarial system by protecting "the attorney's thought processes and legal recommendations" from the prying eyes of his or her opponent. In re Echo Star, 448 F.3d at 1301.
A party may discover work product if the other party waives its immunity. However, work product waiver is not a broad waiver of all work product related to the same subject matter like the attorney-client privilege. Instead, work-product waiver only extends to "factual" or "non-opinion" work product concerning the same subject matter as the disclosed work product. Id. at 1302 (internal citations omitted).
When a party relies on the advice of counsel as a defense to willful infringement the party waives its attorney-client privilege for all communications between the attorney and client, including any documentary communications such as opinion letters and memoranda. Id. (citing AKEVA LLC, 243 F.Supp.2d at 423).
The court in EchoStar recognized at least three categories of work product that are potentially relevant to the advice-of-counsel defense: (1) documents that *964 embody a communication between the attorney and client concerning the subject matter of the case, such as a traditional opinion letter; (2) documents analyzing the law, facts, trial strategy, and so forth that reflect the attorney's mental impressions but were not given to the client; and (3) documents that discuss a communication between attorney and client concerning the subject matter of the case but are not themselves communications to or from the client. The court concluded that waiver extends to the first and third categories but not to the second. In re EchoStar, 448 F.3d at 1303.
The court in EchoStar found that the relevant inquiry is not into the attorneys's files, but into the infringer's state of mind:
Work-product waiver extends only so far as to inform the court of the infringer's state of mind. Counsel's opinion is not important for its legal correctness. It is important to the inquiry whether it is "thorough enough, as combined with other factors, to instill a belief in the infringer that a court might reasonably hold the patent is invalid, not infringed, or unenforceable." It is what the alleged infringer knew or believed, and by contradistinction not what other items counsel may have prepared but did not communicate to the client, that informs the court of an infringer's willfulness.
In re EchoStar, 448 F.3d at 1303 (internal citation omitted)
Where there is an allegation of continuing infringement, waiver may extend to post-filing work product as well, if it is communicated to the client.
EchoStar contends that waiver of opinions does not extend to advice and work product given after litigation began. While this may be true when the work product is never communicated to the client, it is not the case when the advice is relevant to ongoing willful infringement, so long as that ongoing infringement is at issue in the litigation.
See AKEVA LLC, 243 F.Supp.2d at 423 ("[O]nce a party asserts the defense of advice of counsel, this opens to inspection the advice received during the entire course of the alleged infringement.") In re EchoStar, 448 F.3d at 1303.
In the case at bar, Informatica alleges that BODI continues to infringe Informatica's patents (Complaint at paragraphs 13, 15, 17, 18, 20, 24, 25, 27, 29 and 31.)

Conclusion and Order
This Court, after weighing all the persuasive authority, concludes that the Federal Circuit has the final word in a patent case on the subject of the scope of waiver of attorney-client privilege and the work product protection for discovery relevant to a substantive issue after assertion of the advice-of-counsel defense. The court in EchoStar makes it crystal clear that attorney-client communications on the subject of the opinion BODI relies on for its defense are subject to waiver, as well as documents, including work product, which reference these communications. Similarly, both pre- and post-filing work product is potentially relevant to the alleged infringer's intent where there is an allegation of continuing infringement and are therefore also subject to waiver. However, only work product which has either been communicated to the alleged infringer or refers to communications is relevant to intent and therefore subject to waiver by assertion of the advice-of-counsel defense.
This Court finds that, according to the analysis in EchoStar, what is significant is the state of mind of BODI and not the affiliation of BODI's attorneys, and that privilege has been waived with respect to pertinent communications and work product of all counsel in this case. Attorney legal opinions, impressions and trial strategy *965 unrelated to the opinion on which BODI relies may be redacted from documents to be produced to Informatica. The Federal Circuit in EchoStar cautioned that the parties should protect such information.
Still, we must emphasize that such communications may contain work product of the second kind-legal analysis that was not communicated. In those situations, the parties should take special care to redact such information, and if necessary the district court may review such material in camera.

In re EchoStar, 448 F.3d at 1304.
While opinion counsel and trial counsel can be walled off from each other, the immurement is immaterial  what matters, according to the decision by the Federal Circuit in EchoStar, is the state of mind of BODI.
For all the above reasons, informatica's motion to compel further responses from BODI is granted. This Court finds that, by asserting advice of counsel as a defense to a charge of willful infringement of Informatica's patents, BODI waived privilege for both pre-and post-filing pertinent attorney-client communications and work product. Under the analysis in EchoStar, it is immaterial whether BODI's opinion counsel and trial counsel are from the same firm, different firms or are even the same person. What matters is that:
1. BODI relies on advice of counsel as a defense to Informatica's charge that it willfully infringed Informatica's patents;
2. Therefore, BODI waives privilege for communications with counsel on the subject of the opinion or advice on which it relies as well as work product on that subject communicated to BODI or which refers to communications on that subject;
3. Informatica alleges that BODI continues to infringe Informatica's patents;
4. Therefore Informatica is entitled to information subject to waiver which BODI received even after Informatica filed its complaint;
5. The categories of information which BODI must turn over to Informatica include (a) attorney-client communications with any counsel on the subject of the opinion or advice on which BODI relies; (b) work product communicated to BODI on that same subject; (c) work product which reflects any communication on that subject.
Attorney legal opinions, impressions and trial strategy unrelated to the opinion on which BODI relies may be redacted from documents to be produced to Informatica.
All responsive discovery which is being withheld as privileged for which privilege has been waived as discussed above shall be produced within twenty days of the e-filing of this order. BODI shall at the same time produce a privilege log for all other withheld documents, in compliance with the decision in In re Grand Jury Investigation, 974 F.2d 1068, 1070 (9th Cir.1992), citing Dole v. Milonas, 889 F.2d 885, 888 n. 3, 890 (9th Cir.1989).
IT IS SO ORDERED.
