Record-setting Olympic swimmer and gold medalist Michael Phelps proposed to girlfriend Nicole Johnson, according to their verified social media accounts. Announced early Sunday morning on their Twitter and Instagram accounts, Phelps captioned a picture of him and girlfriend Nicole Johnson cuddling in the snow, “She said yes!”

Johnson  posted a similar photo showing the engagement ring on her finger against a winter background. “I am gonna be a Mrs,” she captioned hers, adding his name at the end.  Phelps’s training partner and fellow Olympian Allison Schmitt  snapped both photos of the happy couple and posted her own shot of the “soon to be Mr. & Mrs. Phelps.”

Nicole Johnson was Miss California in 2010 and has dated Phelps on and off the past few years. Phelps and Johnson have been dating since 2007, and remained friends throughout the years. After splitting in late 2011, the couple rekindled their romance in 2014.

His sister, Hilary Phelps, congratulated the couple on her Facebook page. “CONGRATULATIONS to these two lovebirds on their engagement! Couldn’t be happier for my brother and thrilled to gain a sister, who I adore and love already!”

The engagement comes at the end of a six-month suspension from USA Swimming. The suspension was a consequence of his second driving under the influence (DUI)  arrest that violated the sport’s code of conduct. His six-month suspension means he’s not swimming with the U.S. team at the world championships this year. The suspension ends March 6, and Phelps is expected to return to competition at Mesa, Arizona, in April.