; (ii) in subparagraph (H), by striking the period at the end and inserting ; and ; and (iii) by adding at the end the following new subparagraph: (I) the Secretary shall create additional groups of covered OPD services that classify separately procedures and services that employ medical devices and drugs described in a subparagraph of paragraph (22), in accordance with such paragraph. ; and (B) by adding at the end the following new paragraph: (22) Separate additional payment groups for certain drugs and devices previously eligible for pass-through payments For purposes of paragraph (2)(I), the following shall apply: (A) In general For payments under this subsection for services furnished on or after January 1, 2020, the Secretary shall, in accordance with subparagraph (B), create additional groups of covered OPD services to classify separately from other covered OPD services the following: (i) Existing pass-through drugs and devices Medical devices and drugs that met the requirements of paragraph (6)(A)(iv) and were receiving payment under paragraph (6) by reason of satisfying such requirements beginning on or after the date of enactment of this paragraph. (ii) Retired pass-through drugs and devices Medical devices and drugs that had met the requirements of paragraph (6)(A)(iv) and were receiving payment under paragraph (6) by reason of satisfying such requirements before the date of enactment of this paragraph but after January 1, 2010. (B) Considerations In carrying out subparagraph (A), the Secretary shall— (i) bundle procedures and services that employ a device to which such subparagraph applies with all relevant diagnostic tests and surgical procedures, as applicable; (ii) bundle procedures and services that employ a drug, with respect to which payment is not made on or after the date specified in subparagraph (A) in accordance with the methodology under section 1847A and to which such subparagraph applies, with all relevant diagnostic tests and surgical procedures, as applicable