After years of uncertainty, the International Swimming Hall of Fame will keep its home at the Fort Lauderdale Aquatics Complex (FLAC), which is set for a $27 million makeover.

Since 1965, ISHOF and its museum have operated on the same property as FLAC, owned by the City of Fort Lauderdale. Now, a new 30-year lease secures the location — and patches up what’s been described as a contentious chapter between the two parties.

The nonprofit’s future at the dated facility was uncertain in recent years. ISHOF and city officials were at odds over, among other things, how FLAC should be redeveloped. The city envisioned an aquatics center more akin to a waterpark, while ISHOF insisted that the complex be restored as a venue for racing, diving and water polo events, said ISHOF CEO Brent Rutemiller said. When the organization’s 50-year lease expired in 2015, it continued to operate the museum on a month-to-month basis. FLAC sat in limbo while ISHOF contemplated a move.

The two finally came to an agreement and worked together on raising funds for the overhaul, which is expected to breathe new life into the aging complex, once a world-class venue for competitive aquatic sports. Plans call for new competition and diving pools, repair and expansion of training and instructional pools, a new grandstand, bathrooms and a spa.

“It’s a huge reset button,” said Rutemiller. “It’s an incredible gift.”

This begins a new era for ISHOF, which also experienced a leadership change when longtime CEO Bruce Wigo stepped down last year and was replaced by Rutemiller, publisher of Swimming World Magazine. He and the board of directors immediately re-engaged with the city to discuss long-term plans.

“Our little old hall of fame has some stability now,” said ISHOF Board Chairman Bill Kent.

The aquatic center’s renovation, Rutemiller said, will kickstart a fundraising effort to modernize the museum.