ESPN has exercised its option to extend a base-rights media deal with the Atlantic Coast Conference through 2035-36, aligning the timeline with a second deal that covers their partnership for the ACC Network.

The deal will mean that most of the ACC’s football, basketball, and other games and events will stay on ESPN airwaves for the foreseeable future. When ESPN’s new streaming service Flagship launches later this year,

ESPN picked up its option to broadcast ACC sports through 2036. The conference reportedly will try to settle lawsuits by Florida State and Clemson.