; (2) in subsection (f), by striking 20 and inserting 30 ; and (3) in subsection (g), by striking each of the fiscal years 2006 through 2015 and inserting each of fiscal years 2018 through 2027 . (b) Hydroelectric efficiency improvement Section 243(c) of the Energy Policy Act of 2005 ( 42 U.S.C. 15882(c) ) is amended by striking each of the fiscal years 2006 through 2015 and inserting each of fiscal years 2018 through 2027 . II Geothermal 3011. Geothermal energy (a) Sense of Congress regarding national goals for production and site identification It is the sense of Congress that, not later than 10 years after the date of enactment of this Act— (1) the Secretary of the Interior shall seek to approve a significant increase in new geothermal energy capacity on public land across a geographically diverse set of States using the full range of available technologies; and (2) the Secretary, acting through the Director of the United States Geological Survey, should identify sites capable of producing a total of 50,000 megawatts of geothermal power, using the full range of available technologies, through a program conducted in collaboration with industry, including cost-shared exploration drilling. (b) Facilitation of coproduction of geothermal energy on oil and gas leases Section 4(b) of the Geothermal Steam Act of 1970 ( 30 U.S.C. 1003(b) ) is amended by adding at the end the following: (4) Land subject to oil and gas lease Land under an oil and gas lease issued pursuant to the Mineral Leasing Act ( 30 U.S.C. 181 et seq.) or the Mineral Leasing Act for Acquired Lands ( 30 U.S.C. 351 et seq.) that is subject to an approved application for permit to drill and from which oil and gas production is occurring may be available for noncompetitive leasing under this section to the holder of the oil and gas lease— (A) on a determination that— (i) geothermal energy will be produced from a well producing or capable of producing oil and gas; and (ii) national energy security will be improved by the issuance of such a lease