Michael Phelps announced over the weekend that he’s engaged to his longtime on-and-off girlfriend Nicole Johnson.

Michael Phelps Engaged

Phelps, 29, revealed his engagement to Johnson, who was crowned Miss California USA in 2010, on Instagram early Sunday morning. “She said yes,” he captioned a picture of the two of them in the snow.

A photo posted by Michael Phelps (@m_phelps00) on Feb 21, 2015 at 10:49pm PST

Phelps, the 22-time Olympic medaling swimmer, first started dating Johnson back in 2007. They reportedly spilt in 2010 but reunited in late 2014.

Check Out uInterview’s Exclusive With Michael Phelps’ Ex Taylor Chandler

Though Phelps had planned to retire from competitive swimming, he announced his decision to return to the sport last year. However, after his second drunk-driving incident, Phelps was handed down a six-month suspension form USA Swimming. The suspension ends March 6, and Phelps will return to competition in April in Mesa, Ariz.