; (2) in subsection (f)— (A) by amending paragraph (1) to read as follows: (1) In general Not later than 45 days after the service of any civil investigative demand upon any person under subsection (c), or at any time before the return date specified in the demand, whichever period is shorter, or within such period exceeding 45 days after service or in excess of such return date as may be prescribed in writing, subsequent to service, by any Agency investigator named in the demand, such person may file, in the district court of the United States for any judicial district in which such person resides, is found, or transacts business, a petition for an order modifying or setting aside the demand. ; and (B) in paragraph (2), by striking at the Bureau ; and (3) in subsection (h)— (A) by striking (1) In general.— ; and (B) by striking paragraph (2). 717. Agency dual mandate and economic analysis (a) Purpose Section 1021(a) of the Consumer Financial Protection Act of 2010 ( 12 U.S.C. 5511(a) ) is amended by adding at the end the following: In addition, the Director shall seek to implement and, where applicable, enforce Federal consumer financial law consistently for the purpose of strengthening participation in markets by covered persons, without Government interference or subsidies, to increase competition and enhance consumer choice. . (b) Office of Economic Analysis (1) In general Section 1013 of the Consumer Financial Protection Act of 2010 ( 12 U.S.C. 5493 ) is amended by adding at the end the following: (h) Office of Economic Analysis (1) Establishment The Director shall, not later than the end of the 60-day period beginning on the date of the enactment of this subsection, establish an Office of Economic Analysis. (2) Direct reporting The head of the Office of Economic Analysis shall report directly to the Director. (3) Review and assessment of proposed rules and regulations The Office of Economic Analysis shall— (A) review all proposed rules and regulations of the Agency