Shortstop Ha-Seong Kim is joining the Tampa Bay Rays on a two-year, $29 million deal, ESPN’s Jeff Passan reported on Wednesday. The deal includes an opt-out after this season. Kim is coming off shoulder surgery but could return to action in May.

Infielder Ha-Seong Kim and the Tampa Bay Rays are in agreement on a two-year, $29 million contract that includes an opt-out after the first season, sources tell ESPN. Kim is coming off shoulder surgery but is expected to return in May and slated to take over at shortstop.

A person familiar with negotiations says the Tampa Bay Rays and free agent Ha-Seong Kim have agreed to a two-year contract valued at $29 million.