Aug 17, 2016 06:53 AM EDT By Emily Marks, UniversityHerald Reporter

Michael Phelps has announced that the 2016 Rio Olympics will be his last. After the Games, he will continue his wedding plans with fiancee Nicole Johnson.

E! News reported that the most decorated Olympian of all time will not be returning for the 2020 Olympic Games in Tokyo. He also shared his thoughts on his wedding with Nicole Johnson.

"Planning a wedding has been challenging the last couple of months," he said. "We've tried to get everything in order before Rio started. I know Nicole has been working very hard when I've been traveling, but she's asked for a lot of input and I've kinda given her free reign to make the wedding exactly how she wants."

According to Baltimore Sun, Phelps' fiancee, Nicole Johnson, has revealed that they already have a date set for their wedding. Johnson described the ceremony as "small and intimate" but added that they plan to have a "massive bash for everyone in the States" as well.

Phelps and Johnson got engaged February of last year. They welcomed their first child, Boomer, last May.

"They had to figure that out themselves, and they had to mature," Debbie Phelps, Michael's mother, said about her son's relationship with Johnson. "When he called me and said, 'I'm getting back with Nicole," ... I said, 'That's where you should be.'"

Michael Phelps finished his 2016 Rio Olympics performance with a gold medal in the 400m medley race. He will be taking home five gold medals, including the one from the 200m individual medley event, as well as one silver medal for the 100m butterfly event.

The 31-year-old also talked about his baby son, Boomer, being in the 2016 Rio Olympics, saying that it is "the best Olympics." "Being able to have my first child be able to watch me swim and be there, he may not be able to understand really what's going on, but just being able to have his presence here and know that he's always up in the stands," he told E! News.

See Now: Covert Team Inside Newsweek Revealed as Key Players in False Human Trafficking Lawsuit