; 37 U.S.C. 357 note) is amended— (1) by redesignating paragraphs (1) and (2) as subparagraphs (A) and (B), respectively, and by moving such subparagraphs, as so redesignated, two ems to the right; (2) by striking The Secretary may and inserting the following: (1) In general The Secretary shall ; (3) in subparagraph (A), as redesignated by paragraph (1), by striking subsection (b) and inserting subsection (c) ; and (4) by adding at the end the following new paragraph: (2) Evaluation of types of special and incentive pay In making the determination and certification described in paragraph (1)(B), the Secretary shall evaluate each type or category of special and incentive pay separately and may make the determination and certification based on the effect on an Armed Force concerned of a particular type or category of special or incentive pay. . 622. Expansion of continuation pay eligibility (a) Continuation pay: full TSP members with 8 to 12 years of service Section 356 of title 37, United States Code, is amended— (1) in the section heading, by striking 8 and inserting 7