Olympic swimmer Michael Phelps and former Miss California Nicole Johnson announced their engagement on Saturday via social media.
The couple had been dating on and off since 2007, and had remained friends throughout the years, according to People Magazine. .
On Saturday on Phelps' Instagram, with a caption that read "She said yes."
His fiance shared the happy news on her account as well. The couple had their photos taken by Phelps's training partner and fellow Olympian Allison Schmitt, who posted her own photo of the "soon to be Mr. & Mrs. Phelps."