; (2) by inserting after paragraph (1), the following: (2) Design and selection on and after July 1, 2021 (A) In general Notwithstanding paragraph (1), for the borrower of a loan made on or after July 1, 2021, and for other borrowers subject to paragraph (7), the Secretary shall offer a borrower of a loan made under this part 2 plans for repayment of such loan, including principal and interest on the loan. The borrower shall be entitled to accelerate, without penalty, repayment on the borrower’s loans under this part. The borrower may choose— (i) a fixed repayment plan described in section 493E; or (ii) the income-based repayment plan under section 493C(f). (B) Selection by the Secretary If a borrower of a loan made under this part on or after July 1, 2021, does not select a repayment plan described in subparagraph (A), the Secretary may provide the borrower with a fixed repayment plan described in section 493E. (C) Changes in selections Beginning on July 1, 2021, a borrower of a loan made under this part may change the borrower’s selection of a repayment plan in accordance with paragraph (7) and under such terms and conditions as may be established by the Secretary. ; (3) in paragraph (6)(B), as redesignated, by striking an income contingent repayment plan. and inserting the income-based repayment plan under section 493C(f). ; and (4) by adding at the end the following: (7) Borrowers of loans made before July 1, 2021 A borrower who is in repayment on a loan made under part B or part D before July 1, 2021— (A) may choose to retain the repayment plan that the borrower was enrolled in on the day before such date; (B) may elect to— (i) enter the income-based repayment plan under section 493C(f); or (ii) enter a fixed repayment plan described in section 493E