Klay Thompson‘s contract situation will be a discussion point throughout the season. The Golden State Warriors star is in the final year of his five-year $189 million deal and will become an unrestricted free agent at the end of the season. A recent report by The Athletic’s Shams Charania has noted that both Thompson and the Warriors front office are far apart on agreeing a new deal.

When speaking to the media on Oct. 27, Thompson noted his focus on the task at hand, which is playing at a high level through the season. He believes the contract situation will work itself out, one way or another. Thompson has been with the Warriors for his entire career and has previously discussed his desire to retire with the franchise if given the opportunity.

Thompson has undertaken a new defensive role for the Warriors this season and has shown signs of the high-level defense that made him such a unique member of the team’s rotation throughout his prime years. However, during his first two games of the season, Thompson’s three-point shot has been rusty, with the veteran hitting just 33.3% of his attempts from the perimeter.

Thompson is still an elite shooter and will undoubtedly raise his shooting percentage before the end of the season. However, he will need to prove his defensive is still one of his best attributes; if he can do that, he will likely be inking a new deal to stay in the Bay Area once the current season concludes.

Story originally appeared on Warriors Wire