After her popular All I Have residency show at Planet Hollywood in Las Vegas concluded on Saturday, Jennifer Lopez got back together with her ex-boyfriend Sean “Diddy” Combs.

Images from the afterparty at Caesars Palace’s Mr. Chow show Lopez, 49, chatting and giving Diddy, 48, a warm embrace. Diddy sported a denim jacket for a more laid-back look, while Lopez wore a glittering jumpsuit, hoop earrings, and pulled back hair.

Diddy and Lopez’s current boyfriend, Alex Rodriguez, held hands and seemed to talk while Lopez grinned, demonstrating that there are no bitter feelings between them.

Diddy enjoyed a Ciroc during the afterparty and socialized with Anthony Anderson and Evan Ross. Ja Rule and LL Cool J also made appearances, and Ashley Graham, Gayle King, Vanessa Hudgens, Tiffany Haddish, Ben Baller, Adrienne Bailon, and Jeannie Mai all danced.