Nicole Johnson has been right by fiancé Michael Phelps’ side during the 2016 Olympics in Rio, but the former Miss California is also busy putting the finishing touches on their wedding. In a new interview, Johnson opened up about wedding preparations and dished on rekindling things with Phelps after their 2011 split.

While speaking with “Access Hollywood” Friday in Rio, Johnson said she and Phelps have already picked a date for their wedding and want a “small and intimate” ceremony. The 31-year-old pageant winner said their reception will be a “massive bash” for their family and friends in the States. “We’re kind of getting things rolling,” she said. “I think I have the wedding in order, and now it’s on to the party for the fun.”

Phelps and Johnson got engaged in February 2015 after dating on and off since 2007. The pair split in 2011 but got back together a few years later, in 2014. They welcomed their first child together, a son named Boomer, in May.

Johnson admitted to “Access Hollywood” that her relationship with Phelps hasn’t always been easy and said there was a point when she thought they were done for good. “I’m pretty sure we both shared stuff with our parents that we were like, ‘Yea, this is it. There’s no way we’re getting back together,’” she said. “And when we finally did, it was still a little rocky and figuring things out and figuring each other out because it’s been some time but we didn’t miss a beat and we’re happy. … Now we have a little one and a wedding at the end of this year. So we got a lot of fun.”

In an interview last year with USA Today, Phelps opened up about Johnson giving him a second chance, telling the outlet that he used to tell his friends if he got another shot with her, he wouldn’t mess things up. “I never wanted to have a, ‘What if?’ I just told her exactly how I felt,” he said. “I was like, as long as I can tell her that, I can go through my life and be happy. Whatever happens, happens. Obviously we worked through some things. There’s nobody in the world I would rather be with.”

He added: “Her and I have been on and off for eight years. It’s been a long time. We’ve been through a lot. But I love her to death.”