Please note that if you purchase something by clicking on a link within this story, we may receive a small commission of the sale.

In the Square, EJ talks on the phone with Rita about a secretive shipment. He’s confident the distraction of the gala will help avoid scrutiny. He goes to Belle’s office, where Johnny and Chanel sign adoption paperwork. After receiving a chilly reception from his son, he wonders if his talk with Amy changed her mind about allowing them to adopt.

After the new parents leave, EJ tells Belle he wants to publicly acknowledge John’s bequest to the hospital at the gala. Belle is touched but will have to talk to her family about it. He details his conversation with Amy about the difficulties of parenthood and learns that Belle is not pressing charges against Sophia. Despite his initial ire toward the teen, EJ says she made the right decision. Belle appears affected as he leaves.

It’s Not Necessarily Goodbye

After sharing an emotional moment alone with Tesoro in their bedroom, Leo and Javi bring the baby downstairs to the rest of the Hernandez family. Feeling “verklempt,” Leo rambles and makes jokes about going on the run with Tesoro. Gabi embraces him, knowing how hard it is on him and Javi. They all leave as a family.

Johnny and Chanel meet the solemn Hernandez family in the Square to pick up Tesoro. Chanel thanks them for taking such good care of him, and Johnny and Rafe share a nice fatherly/son moment. Ari points out that since Tesoro is her cousin now, it’ll be like they’re one big happy family. Leo gives them a detailed binder of Tesoro’s habits and likes, and Rafe recalls Johnny being around Little T’s age. He marvels over him being a dad now.

Johnny says Rafe was the best father he could have asked for and asks him to be his son’s honorary grandfather. Chanel asks Leo and Javi to be his godparents, and Ari volunteers to babysit. The somber mood briefly lightens as the Hernandez family looks forward to their new roles in the boy’s life. However, the tears return as Johnny and Chanel leave with their son.

After Rafe comforts his family, he stays behind as everyone else disperses. EJ arrives, oblivious that they just gave up Tesoro. Rafe gets in digs about EJ’s strained relationship with Johnny and gloats that the role of paternal grandfather has been filled. As EJ seethes, Rafe gleefully answers a call from “Grandma” Sami.

Ari and Gabi get breakfast at the Pub, where Ari talks about Aaron. When Gabi inquires further, a giggling Ari insists they’re just friends who platonically bonded over Tesoro. Gabi offers her an internship at Gabi Chic, but Ari declines, having heard the horror stories from Javi. However, she’s proud of her mom for getting her company back. They discuss how Ari’s dad and Grandpa Lucas are coming home for the gala and plan to spend time together as a family.

Tesoro’s Meaningful New Name

Paulina and Marlena decorate Johnny and Chanel’s place with blue balloons and an “It’s a boy” banner. Paulina knows it must be a hard day for Marlena, since it’s her anniversary. The baby is a lovely distraction for Marlena, though. She knows how thrilled John would be that his namesake is becoming a father. Belle arrives and receives Marlena’s permission for John to be publicly acknowledged at the gala.

Johnny and Chanel come home with the baby, and the three women fawn over him. The new parents reveal they’re naming him Trey, meaning the third, as in John the Third. Johnny’s been so honored to have his grandfather’s name. Trying to live up to it has made him a better person — at least most of the time. Marlena chokes up. Chanel adds that Trey’s middle name will be Paul, after Paulina, whose love and support helped make this happen. A touched Paulina delights in the gesture. Johnny gets a call from Sami and learns she’s coming to town to meet her grandson. Belle forces a smile.

Leo and Javi return to Tesoro’s empty crib in their bedroom. Leo knows this must bring up painful memories of the last time Javi said goodbye to a baby. But this time, he’s there to help him through it. Javi’s there to help him, too.